Index: head/sys/conf/kmod.mk =================================================================== --- head/sys/conf/kmod.mk (revision 285067) +++ head/sys/conf/kmod.mk (revision 285068) @@ -1,450 +1,431 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 # $FreeBSD$ # # The include file handles building and installing loadable # kernel modules. # # # +++ variables +++ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # # EXPORT_SYMS A list of symbols that should be exported from the module, # or the name of a file containing a list of symbols, or YES # to export all symbols. If not defined, no symbols are # exported. # # KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] # # KMODOWN Module file owner. [${BINOWN}] # # KMODGRP Module file group. [${BINGRP}] # # KMODMODE Module file mode. [${BINMODE}] # # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] # -# MFILES Optionally a list of interfaces used by the module. -# This file contains a default list of interfaces. -# # PROG The name of the kernel module to build. # If not supplied, ${KMOD}.ko is used. # # SRCS List of source files. # # FIRMWS List of firmware images in format filename:shortname:version # # FIRMWARE_LICENSE # Set to the name of the license the user has to agree on in # order to use this firmware. See /usr/share/doc/legal # # DESTDIR The tree where the module gets installed. [not set] # # +++ targets +++ # # install: # install the kernel module; if the Makefile # does not itself define the target install, the targets # beforeinstall and afterinstall may also be used to cause # actions immediately before and after the install target # is executed. # # load: # Load a module. # # unload: # Unload a module. # AWK?= awk KMODLOAD?= /sbin/kldload KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy .include # Grab all the options for a kernel build. For backwards compat, we need to # do this after bsd.own.mk. .include "kern.opts.mk" .include .include "config.mk" -.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S +.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .m # amd64 and mips use direct linking for kmod, all others use shared binaries .if ${MACHINE_CPUARCH} != amd64 && ${MACHINE_CPUARCH} != mips __KLD_SHARED=yes .else __KLD_SHARED=no .endif .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing .endif WERROR?= -Werror CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. NOSTDINC= -nostdinc CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif # Add -I paths for system headers. Individual module makefiles don't # need any -I paths for this. Similar defaults for .PATH can't be # set because there are no standard paths for non-headers. CFLAGS+= -I. -I${SYSDIR} CFLAGS.gcc+= -finline-limit=${INLINE_LIMIT} CFLAGS.gcc+= -fms-extensions CFLAGS.gcc+= --param inline-unit-growth=100 CFLAGS.gcc+= --param large-function-growth=1000 # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. CFLAGS+= -fno-common LDFLAGS+= -d -warn-common CFLAGS+= ${DEBUG_FLAGS} .if ${MACHINE_CPUARCH} == amd64 CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer .endif # Temporary workaround for PR 196407, which contains the fascinating details. # Don't allow clang to use fpu instructions or registers in kernel modules. .if ${MACHINE_CPUARCH} == arm CFLAGS.clang+= -mllvm -arm-use-movt=0 CFLAGS.clang+= -mfpu=none CFLAGS+= -funwind-tables .endif .if ${MACHINE_CPUARCH} == powerpc CFLAGS+= -mlongcall -fno-omit-frame-pointer .endif .if ${MACHINE_CPUARCH} == mips CFLAGS+= -G0 -fno-pic -mno-abicalls -mlong-calls .endif .if defined(DEBUG) || defined(DEBUG_FLAGS) CTFFLAGS+= -g .endif .if defined(FIRMWS) ${KMOD:S/$/.c/}: ${SYSDIR}/tools/fw_stub.awk ${AWK} -f ${SYSDIR}/tools/fw_stub.awk ${FIRMWS} -m${KMOD} -c${KMOD:S/$/.c/g} \ ${FIRMWARE_LICENSE:C/.+/-l/}${FIRMWARE_LICENSE} SRCS+= ${KMOD:S/$/.c/} CLEANFILES+= ${KMOD:S/$/.c/} .for _firmw in ${FIRMWS} ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} @if [ -e ${_firmw:C/\:.*$//} ]; then \ ${LD} -b binary --no-warn-mismatch ${_LDFLAGS} \ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ else \ ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \ ${LD} -b binary --no-warn-mismatch ${_LDFLAGS} \ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ rm ${_firmw:C/\:.*$//}; \ fi OBJS+= ${_firmw:C/\:.*$/.fwo/} .endfor .endif # Conditionally include SRCS based on kernel config options. .for _o in ${KERN_OPTS} SRCS+=${SRCS.${_o}} .endfor OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) PROG= ${KMOD}.ko .endif .if !defined(DEBUG_FLAGS) FULLPROG= ${PROG} .else FULLPROG= ${PROG}.debug ${PROG}: ${FULLPROG} ${PROG}.symbols ${OBJCOPY} --strip-debug --add-gnu-debuglink=${PROG}.symbols\ ${FULLPROG} ${.TARGET} ${PROG}.symbols: ${FULLPROG} ${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET} .endif .if ${__KLD_SHARED} == yes ${FULLPROG}: ${KMOD}.kld ${LD} -Bshareable ${_LDFLAGS} -o ${.TARGET} ${KMOD}.kld .if !defined(DEBUG_FLAGS) ${OBJCOPY} --strip-debug ${.TARGET} .endif .endif EXPORT_SYMS?= NO .if ${EXPORT_SYMS} != YES CLEANFILES+= export_syms .endif .if ${__KLD_SHARED} == yes ${KMOD}.kld: ${OBJS} .else ${FULLPROG}: ${OBJS} .endif ${LD} ${_LDFLAGS} -r -d -o ${.TARGET} ${OBJS} .if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} .endif .if defined(EXPORT_SYMS) .if ${EXPORT_SYMS} != YES .if ${EXPORT_SYMS} == NO :> export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) echo ${EXPORT_SYMS} > export_syms .else grep -v '^#' < ${EXPORT_SYMS} > export_syms .endif awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \ export_syms | xargs -J% ${OBJCOPY} % ${.TARGET} .endif .endif .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no ${OBJCOPY} --strip-debug ${.TARGET} .endif _ILINKS=machine .if ${MACHINE} != ${MACHINE_CPUARCH} _ILINKS+=${MACHINE_CPUARCH} .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 .endif CLEANFILES+=${_ILINKS} all: objwarn ${PROG} beforedepend: ${_ILINKS} # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. .for _link in ${_ILINKS} .if !exists(${.OBJDIR}/${_link}) ${OBJS}: ${_link} .endif .endfor # Search for kernel source tree in standard places. .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys .if !defined(SYSDIR) && exists(${_dir}/kern/) SYSDIR= ${_dir} .endif .endfor .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) .error "can't find kernel source tree" .endif .NOPATH: ${_ILINKS} ${_ILINKS}: @case ${.TARGET} in \ machine) \ path=${SYSDIR}/${MACHINE}/include ;; \ *) \ path=${SYSDIR}/${.TARGET:T}/include ;; \ esac ; \ path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET:T} "->" $$path ; \ ln -sf $$path ${.TARGET:T} CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} .if defined(DEBUG_FLAGS) CLEANFILES+= ${FULLPROG} ${PROG}.symbols .endif .if !target(install) _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor .if !target(realinstall) realinstall: _kmodinstall .ORDER: beforeinstall _kmodinstall _kmodinstall: ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} .if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no" ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR} .endif .include .if !defined(NO_XREF) afterinstall: _kldxref .ORDER: realinstall _kldxref .ORDER: _installlinks _kldxref _kldxref: @if type kldxref >/dev/null 2>&1; then \ ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ kldxref ${DESTDIR}${KMODDIR}; \ fi .endif .endif # !target(realinstall) .endif # !target(install) .if !target(load) load: ${PROG} ${KMODLOAD} -v ${.OBJDIR}/${PROG} .endif .if !target(unload) unload: ${KMODUNLOAD} -v ${PROG} .endif .if defined(KERNBUILDDIR) .PATH: ${KERNBUILDDIR} CFLAGS+= -I${KERNBUILDDIR} .for _src in ${SRCS:Mopt_*.h} CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else .for _src in ${SRCS:Mopt_*.h} CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: :> ${.TARGET} .endif .endfor .endif # Respect configuration-specific C flags. CFLAGS+= ${CONF_CFLAGS} -MFILES?= dev/acpica/acpi_if.m dev/acpi_support/acpi_wmi_if.m \ - dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ - dev/fb/fb_if.m dev/gpio/gpio_if.m dev/gpio/gpiobus_if.m \ - dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ - dev/mbox/mbox_if.m dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ - dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \ - dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ - dev/pci/pci_iov_if.m dev/pci/pcib_if.m dev/ppbus/ppbus_if.m \ - dev/sdhci/sdhci_if.m dev/smbus/smbus_if.m dev/spibus/spibus_if.m \ - dev/sound/pci/hda/hdac_if.m \ - dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ - dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ - dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/clock_if.m \ - kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ - libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ - pc98/pc98/canbus_if.m dev/etherswitch/mdio_if.m - -.for _srcsrc in ${MFILES} -.for _ext in c h -.for _src in ${SRCS:M${_srcsrc:T:R}.${_ext}} -CLEANFILES+= ${_src} -.if !target(${_src}) -${_src}: ${SYSDIR}/tools/makeobjops.awk ${SYSDIR}/${_srcsrc} - ${AWK} -f ${SYSDIR}/tools/makeobjops.awk ${SYSDIR}/${_srcsrc} -${_ext} -.endif -.endfor # _src -.endfor # _ext -.endfor # _srcsrc - .if !empty(SRCS:Mvnode_if.c) CLEANFILES+= vnode_if.c vnode_if.c: ${SYSDIR}/tools/vnode_if.awk ${SYSDIR}/kern/vnode_if.src ${AWK} -f ${SYSDIR}/tools/vnode_if.awk ${SYSDIR}/kern/vnode_if.src -c .endif .if !empty(SRCS:Mvnode_if.h) CLEANFILES+= vnode_if.h vnode_if_newproto.h vnode_if_typedef.h vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: ${SYSDIR}/tools/vnode_if.awk \ ${SYSDIR}/kern/vnode_if.src vnode_if.h: vnode_if_newproto.h vnode_if_typedef.h ${AWK} -f ${SYSDIR}/tools/vnode_if.awk ${SYSDIR}/kern/vnode_if.src -h vnode_if_newproto.h: ${AWK} -f ${SYSDIR}/tools/vnode_if.awk ${SYSDIR}/kern/vnode_if.src -p vnode_if_typedef.h: ${AWK} -f ${SYSDIR}/tools/vnode_if.awk ${SYSDIR}/kern/vnode_if.src -q .endif + +# Build _if.[ch] from _if.m, and clean them when we're done. +__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m +_MPATH=${__MPATH:H:O:u} +.PATH.m: ${_MPATH} +.for _s in ${SRCS:M*_if.[ch]} +.if eixsts(${_s:R}.m}) +CLEANFILES+= ${_s} +.endif +.endfor # _s +.m.c: ${SYSDIR}/tools/makeobjops.awk + ${AWK} -f ${SYSDIR}/tools/makeobjops.awk ${.IMPSRC} -c + +.m.h: ${SYSDIR}/tools/makeobjops.awk + ${AWK} -f ${SYSDIR}/tools/makeobjops.awk ${.IMPSRC} -h .for _i in mii pccard .if !empty(SRCS:M${_i}devs.h) CLEANFILES+= ${_i}devs.h ${_i}devs.h: ${SYSDIR}/tools/${_i}devs2h.awk ${SYSDIR}/dev/${_i}/${_i}devs ${AWK} -f ${SYSDIR}/tools/${_i}devs2h.awk ${SYSDIR}/dev/${_i}/${_i}devs .endif .endfor # _i .if !empty(SRCS:Musbdevs.h) CLEANFILES+= usbdevs.h usbdevs.h: ${SYSDIR}/tools/usbdevs2h.awk ${SYSDIR}/dev/usb/usbdevs ${AWK} -f ${SYSDIR}/tools/usbdevs2h.awk ${SYSDIR}/dev/usb/usbdevs -h .endif .if !empty(SRCS:Musbdevs_data.h) CLEANFILES+= usbdevs_data.h usbdevs_data.h: ${SYSDIR}/tools/usbdevs2h.awk ${SYSDIR}/dev/usb/usbdevs ${AWK} -f ${SYSDIR}/tools/usbdevs2h.awk ${SYSDIR}/dev/usb/usbdevs -d .endif .if !empty(SRCS:Macpi_quirks.h) CLEANFILES+= acpi_quirks.h acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirks ${AWK} -f ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirks .endif .if !empty(SRCS:Massym.s) CLEANFILES+= assym.s genassym.o assym.s: genassym.o .if defined(KERNBUILDDIR) genassym.o: opt_global.h .endif assym.s: ${SYSDIR}/kern/genassym.sh sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET} genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c genassym.o: ${SRCS:Mopt_*.h} ${CC} -c ${CFLAGS:N-fno-common} \ ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c .endif lint: ${SRCS} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} .if defined(KERNBUILDDIR) ${OBJS}: opt_global.h .endif .include cleandepend: cleanilinks # .depend needs include links so we remove them only together. cleanilinks: rm -f ${_ILINKS} .if !exists(${.OBJDIR}/${DEPENDFILE}) ${OBJS}: ${SRCS:M*.h} .endif .include .include "kern.mk" Index: head/sys/modules/agp/Makefile =================================================================== --- head/sys/modules/agp/Makefile (revision 285067) +++ head/sys/modules/agp/Makefile (revision 285068) @@ -1,47 +1,46 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/agp KMOD= agp SRCS= agp.c agp_if.c .if ${MACHINE_CPUARCH} == "i386" SRCS+= agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c \ agp_nvidia.c agp_ati.c .endif .if ${MACHINE} == "i386" SRCS+= agp_amd64.c .endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= agp_amd64.c agp_i810.c agp_via.c .endif .if ${MACHINE_CPUARCH} == "powerpc" SRCS+= agp_apple.c .endif SRCS+= device_if.h bus_if.h agp_if.h pci_if.h SRCS+= opt_agp.h -MFILES= kern/device_if.m kern/bus_if.m dev/agp/agp_if.m dev/pci/pci_if.m EXPORT_SYMS= agp_find_device \ agp_state \ agp_acquire \ agp_release \ agp_enable \ agp_alloc_memory \ agp_free_memory \ agp_bind_memory \ agp_unbind_memory \ agp_memory_info .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" EXPORT_SYMS+= intel_gtt_clear_range \ intel_gtt_insert_pages \ intel_gtt_get \ intel_gtt_chipset_flush \ intel_gtt_unmap_memory \ intel_gtt_map_memory \ intel_gtt_insert_sg_entries \ intel_gtt_get_bridge_device .endif .include Index: head/sys/modules/geom/geom_part/geom_part_apm/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_apm/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_apm/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_apm SRCS= g_part_apm.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_bsd/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_bsd/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_bsd/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part ${.CURDIR}/../../../../geom KMOD= geom_part_bsd SRCS= g_part_bsd.c geom_bsd_enc.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_bsd64/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_bsd64/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_bsd64/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_bsd64 SRCS= g_part_bsd64.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_ebr/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_ebr/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_ebr/Makefile (revision 285068) @@ -1,13 +1,11 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_ebr SRCS= g_part_ebr.c SRCS+= bus_if.h device_if.h g_part_if.h SRCS+= opt_geom.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_gpt/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_gpt/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_gpt/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_gpt SRCS= g_part_gpt.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_ldm/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_ldm/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_ldm/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_ldm SRCS= g_part_ldm.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_mbr/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_mbr/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_mbr/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_mbr SRCS= g_part_mbr.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_pc98/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_pc98/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_pc98/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_pc98 SRCS= g_part_pc98.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile =================================================================== --- head/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile (revision 285067) +++ head/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile (revision 285068) @@ -1,12 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../geom/part KMOD= geom_part_vtoc8 SRCS= g_part_vtoc8.c SRCS+= bus_if.h device_if.h g_part_if.h -MFILES= kern/bus_if.m kern/device_if.m geom/part/g_part_if.m - .include Index: head/sys/modules/geom/geom_raid/Makefile =================================================================== --- head/sys/modules/geom/geom_raid/Makefile (revision 285067) +++ head/sys/modules/geom/geom_raid/Makefile (revision 285068) @@ -1,19 +1,16 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../geom/raid KMOD= geom_raid SRCS= g_raid.c SRCS+= g_raid_ctl.c SRCS+= bus_if.h device_if.h SRCS+= g_raid_md_if.h g_raid_md_if.c SRCS+= g_raid_tr_if.h g_raid_tr_if.c SRCS+= md_ddf.c md_intel.c md_jmicron.c md_nvidia.c md_promise.c md_sii.c SRCS+= tr_concat.c tr_raid0.c tr_raid1.c tr_raid1e.c tr_raid5.c -MFILES= kern/bus_if.m kern/device_if.m -MFILES+= geom/raid/g_raid_md_if.m geom/raid/g_raid_tr_if.m - .include Index: head/sys/modules/kgssapi/Makefile =================================================================== --- head/sys/modules/kgssapi/Makefile (revision 285067) +++ head/sys/modules/kgssapi/Makefile (revision 285068) @@ -1,55 +1,54 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../kgssapi ${.CURDIR}/../../rpc/rpcsec_gss KMOD= kgssapi SRCS= gss_accept_sec_context.c \ gss_add_oid_set_member.c \ gss_acquire_cred.c \ gss_canonicalize_name.c \ gss_create_empty_oid_set.c \ gss_delete_sec_context.c \ gss_display_status.c \ gss_export_name.c \ gss_get_mic.c \ gss_init_sec_context.c \ gss_impl.c \ gss_import_name.c \ gss_names.c \ gss_pname_to_uid.c \ gss_release_buffer.c \ gss_release_cred.c \ gss_release_name.c \ gss_release_oid_set.c \ gss_set_cred_option.c \ gss_test_oid_set_member.c \ gss_unwrap.c \ gss_verify_mic.c \ gss_wrap.c \ gss_wrap_size_limit.c \ gssd_prot.c SRCS+= rpcsec_gss.c \ rpcsec_gss_conf.c \ rpcsec_gss_misc.c \ rpcsec_gss_prot.c \ svc_rpcsec_gss.c SRCS+= kgss_if.h kgss_if.c -MFILES= kgssapi/kgss_if.m SRCS+= gssd.h gssd_xdr.c gssd_clnt.c CLEANFILES= gssd.h gssd_xdr.c gssd_clnt.c S= ${.CURDIR}/../.. gssd.h: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h gssd_xdr.c: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c gssd_clnt.c: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c .include Index: head/sys/modules/kgssapi_krb5/Makefile =================================================================== --- head/sys/modules/kgssapi_krb5/Makefile (revision 285067) +++ head/sys/modules/kgssapi_krb5/Makefile (revision 285068) @@ -1,23 +1,22 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../kgssapi/krb5 KMOD= kgssapi_krb5 SRCS= krb5_mech.c \ kcrypto.c \ kcrypto_des.c \ kcrypto_des3.c \ kcrypto_aes.c \ kcrypto_arcfour.c \ opt_inet6.h SRCS+= kgss_if.h gssd.h -MFILES= kgssapi/kgss_if.m CLEANFILES= gssd.h S= ${.CURDIR}/../.. gssd.h: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h .include Index: head/sys/modules/ksyms/Makefile =================================================================== --- head/sys/modules/ksyms/Makefile (revision 285067) +++ head/sys/modules/ksyms/Makefile (revision 285068) @@ -1,10 +1,8 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/ksyms KMOD= ksyms SRCS= ksyms.c linker_if.h -MFILES= kern/linker_if.m - .include Index: head/sys/modules/libiconv/Makefile =================================================================== --- head/sys/modules/libiconv/Makefile (revision 285067) +++ head/sys/modules/libiconv/Makefile (revision 285068) @@ -1,22 +1,21 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys KMOD= libiconv SRCS= iconv.c iconv_ucs.c iconv_xlat.c iconv_xlat16.c SRCS+= iconv.h SRCS+= iconv_converter_if.c iconv_converter_if.h -MFILES= libkern/iconv_converter_if.m EXPORT_SYMS= iconv_add \ iconv_open \ iconv_close \ iconv_conv \ iconv_conv_case \ iconv_convchr \ iconv_convchr_case \ iconv_convstr \ iconv_convmem \ iconv_vfs_refcount .include Index: head/sys/modules/mvs/Makefile =================================================================== --- head/sys/modules/mvs/Makefile (revision 285067) +++ head/sys/modules/mvs/Makefile (revision 285068) @@ -1,10 +1,8 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/mvs KMOD= mvs SRCS= mvs.c mvs_pci.c mvs.h mvs_if.c mvs_if.h device_if.h bus_if.h pci_if.h opt_cam.h -MFILES= kern/bus_if.m kern/device_if.m dev/pci/pci_if.m dev/mvs/mvs_if.m - .include Index: head/sys/modules/nand/Makefile =================================================================== --- head/sys/modules/nand/Makefile (revision 285067) +++ head/sys/modules/nand/Makefile (revision 285068) @@ -1,13 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/nand KMOD = nand SRCS= nand.c nand_bbt.c nand_cdev.c nand_generic.c nand_geom.c \ nand_id.c nandbus.c nandbus_if.c nand_if.c nfc_if.c \ nand_if.h device_if.h bus_if.h nfc_if.h nandbus_if.h -MFILES= kern/bus_if.m kern/device_if.m dev/nand/nfc_if.m \ - dev/nand/nand_if.m dev/nand/nandbus_if.m - .include Index: head/sys/modules/nandsim/Makefile =================================================================== --- head/sys/modules/nandsim/Makefile (revision 285067) +++ head/sys/modules/nandsim/Makefile (revision 285068) @@ -1,11 +1,9 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/nand KMOD= nandsim SRCS= nandsim.c nandsim_chip.c nandsim_swap.c nandsim_ctrl.c nandsim_log.c\ bus_if.h device_if.h vnode_if.h nfc_if.h nand_if.h -MFILES= kern/bus_if.m kern/device_if.m\ - dev/nand/nfc_if.m dev/nand/nand_if.m .include Index: head/sys/modules/proto/Makefile =================================================================== --- head/sys/modules/proto/Makefile (revision 285067) +++ head/sys/modules/proto/Makefile (revision 285068) @@ -1,24 +1,18 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/proto KMOD= proto SRCS= \ proto_bus_isa.c \ proto_bus_pci.c \ proto_busdma.c \ proto_core.c SRCS+= \ bus_if.h \ device_if.h \ isa_if.h \ pci_if.h -MFILES= \ - dev/pci/pci_if.m \ - isa/isa_if.m \ - kern/bus_if.m \ - kern/device_if.m - .include Index: head/sys/modules/puc/Makefile =================================================================== --- head/sys/modules/puc/Makefile (revision 285067) +++ head/sys/modules/puc/Makefile (revision 285068) @@ -1,14 +1,11 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/puc KMOD= puc SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c pucdata.c SRCS+= bus_if.h device_if.h serdev_if.c serdev_if.h \ card_if.h pci_if.h -MFILES= kern/bus_if.m kern/device_if.m kern/serdev_if.m \ - dev/pccard/card_if.m dev/pci/pci_if.m - .include Index: head/sys/modules/scc/Makefile =================================================================== --- head/sys/modules/scc/Makefile (revision 285067) +++ head/sys/modules/scc/Makefile (revision 285068) @@ -1,20 +1,17 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/scc .if ${MACHINE} == "sparc64" scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c .endif .if ${MACHINE_CPUARCH} == "powerpc" scc_bfe= scc_bfe_macio.c scc_bfe_quicc.c scc_dev_quicc.c .endif KMOD= scc SRCS= ${scc_bfe} scc_core.c scc_if.c scc_if.h \ scc_dev_sab82532.c scc_dev_z8530.c SRCS+= bus_if.h device_if.h ofw_bus_if.h serdev_if.c serdev_if.h -MFILES= dev/ofw/ofw_bus_if.m dev/scc/scc_if.m \ - kern/bus_if.m kern/device_if.m kern/serdev_if.m - .include Index: head/sys/modules/uart/Makefile =================================================================== --- head/sys/modules/uart/Makefile (revision 285067) +++ head/sys/modules/uart/Makefile (revision 285068) @@ -1,43 +1,39 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/uart .if ${MACHINE_CPUARCH} == "sparc64" uart_bus_ebus= uart_bus_ebus.c .endif .if ${MACHINE_CPUARCH} == "arm" uart_dev_lpc= uart_dev_lpc.c .endif .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64" || \ ${MACHINE_CPUARCH} == "powerpc" ofw_bus_if= ofw_bus_if.h .endif .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" _uart_cpu=uart_cpu_x86.c .else _uart_cpu=uart_cpu_${MACHINE}.c .endif .if exists(${.CURDIR:H:H}/dev/uart/${_uart_cpu}) uart_cpu_machine= ${_uart_cpu} .endif KMOD= uart SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c ${uart_cpu_machine} uart_dbg.c \ ${uart_dev_lpc} uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \ uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \ power_if.h pccarddevs.h serdev_if.h SRCS+= opt_platform.h -MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ - dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \ - kern/device_if.m kern/serdev_if.m - .include Index: head/sys/modules/virtio/balloon/Makefile =================================================================== --- head/sys/modules/virtio/balloon/Makefile (revision 285067) +++ head/sys/modules/virtio/balloon/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/balloon KMOD= virtio_balloon SRCS= virtio_balloon.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/block/Makefile =================================================================== --- head/sys/modules/virtio/block/Makefile (revision 285067) +++ head/sys/modules/virtio/block/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/block KMOD= virtio_blk SRCS= virtio_blk.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/console/Makefile =================================================================== --- head/sys/modules/virtio/console/Makefile (revision 285067) +++ head/sys/modules/virtio/console/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/console KMOD= virtio_console SRCS= virtio_console.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/network/Makefile =================================================================== --- head/sys/modules/virtio/network/Makefile (revision 285067) +++ head/sys/modules/virtio/network/Makefile (revision 285068) @@ -1,37 +1,34 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/network KMOD= if_vtnet SRCS= if_vtnet.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h SRCS+= opt_inet.h opt_inet6.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/pci/Makefile =================================================================== --- head/sys/modules/virtio/pci/Makefile (revision 285067) +++ head/sys/modules/virtio/pci/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/pci KMOD= virtio_pci SRCS= virtio_pci.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h pci_if.h -MFILES= kern/bus_if.m kern/device_if.m dev/pci/pci_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/random/Makefile =================================================================== --- head/sys/modules/virtio/random/Makefile (revision 285067) +++ head/sys/modules/virtio/random/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/random KMOD= virtio_random SRCS= virtio_random.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/scsi/Makefile =================================================================== --- head/sys/modules/virtio/scsi/Makefile (revision 285067) +++ head/sys/modules/virtio/scsi/Makefile (revision 285068) @@ -1,36 +1,33 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio/scsi KMOD= virtio_scsi SRCS= virtio_scsi.c SRCS+= virtio_bus_if.h virtio_if.h SRCS+= bus_if.h device_if.h opt_scsi.h opt_cam.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include Index: head/sys/modules/virtio/virtio/Makefile =================================================================== --- head/sys/modules/virtio/virtio/Makefile (revision 285067) +++ head/sys/modules/virtio/virtio/Makefile (revision 285068) @@ -1,38 +1,35 @@ # # $FreeBSD$ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # .PATH: ${.CURDIR}/../../../dev/virtio KMOD= virtio SRCS= virtio.c virtqueue.c SRCS+= virtio_bus_if.c virtio_bus_if.h SRCS+= virtio_if.c virtio_if.h SRCS+= bus_if.h device_if.h -MFILES= kern/bus_if.m kern/device_if.m \ - dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m - .include