Index: head/sys/modules/ix/Makefile
===================================================================
--- head/sys/modules/ix/Makefile	(revision 357641)
+++ head/sys/modules/ix/Makefile	(revision 357642)
@@ -1,15 +1,15 @@
 #$FreeBSD$
 
 .PATH:  ${SRCTOP}/sys/dev/ixgbe
 
 KMOD    = if_ix
 SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h
 SRCS	+= opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_ix.c if_bypass.c if_fdir.c if_sriov.c ix_txrx.c ixgbe_osdep.c
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
 SRCS    += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
-CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe -DSMP
+CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/ixv/Makefile
===================================================================
--- head/sys/modules/ixv/Makefile	(revision 357641)
+++ head/sys/modules/ixv/Makefile	(revision 357642)
@@ -1,15 +1,15 @@
 #$FreeBSD$
 
 .PATH:  ${SRCTOP}/sys/dev/ixgbe
 
 KMOD    = if_ixv
 SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h
 SRCS	+= opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_ixv.c if_fdir.c ix_txrx.c ixgbe_osdep.c
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
 SRCS    += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
-CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe -DSMP
+CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/lio/Makefile
===================================================================
--- head/sys/modules/lio/Makefile	(revision 357641)
+++ head/sys/modules/lio/Makefile	(revision 357642)
@@ -1,27 +1,26 @@
 #$FreeBSD$
 
 #.PATH:  ${.CURDIR}
 .PATH: ${.CURDIR}/../../dev/liquidio
 .PATH: ${.CURDIR}/../../dev/liquidio/base
 
 KMOD = if_lio
 CFLAGS += -I${.CURDIR}/../../dev/liquidio
 CFLAGS += -I${.CURDIR}/../../dev/liquidio/base
-CFLAGS += -DSMP
 
 SRCS = device_if.h bus_if.h pci_if.h vnode_if.h opt_inet.h opt_inet6.h
 SRCS += vnode_if_newproto.h vnode_if_typedef.h
 SRCS += lio_main.c lio_sysctl.c lio_ioctl.c lio_core.c
 SRCS += lio_rxtx.c lio_rss.c
 SRCS += lio_device.c lio_ctrl.c
 SRCS += lio_console.c cn23xx_pf_device.c
 SRCS += lio_mem_ops.c lio_droq.c
 SRCS += lio_response_manager.c lio_request_manager.c
 
 FIRMWS = lio_23xx_nic.bin.fw:lio_23xx_nic.bin
 CLEANFILES+= lio_23xx_nic.bin.fw
 
 lio_23xx_nic.bin.fw: ${.CURDIR}/../../contrib/dev/liquidio/lio_23xx_nic.bin.uu
 	uudecode -p ${.CURDIR}/../../contrib/dev/liquidio/lio_23xx_nic.bin.uu > ${.TARGET}
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/oce/Makefile
===================================================================
--- head/sys/modules/oce/Makefile	(revision 357641)
+++ head/sys/modules/oce/Makefile	(revision 357642)
@@ -1,15 +1,15 @@
 #
 # $FreeBSD$
 #
 
 .PATH:	${SRCTOP}/sys/dev/oce
 KMOD	= if_oce
 SRCS    = oce_if.c oce_hw.c oce_mbox.c oce_util.c oce_queue.c oce_sysctl.c
 SRCS    += bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h
 
-CFLAGS+= -I${SRCTOP}/sys/dev/oce -DSMP
+CFLAGS+= -I${SRCTOP}/sys/dev/oce
 
 # uncomment for lock profiling statistics
 #CFLAGS  += -DLOCK_PROFILING
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/vmm/Makefile
===================================================================
--- head/sys/modules/vmm/Makefile	(revision 357641)
+++ head/sys/modules/vmm/Makefile	(revision 357642)
@@ -1,83 +1,83 @@
 # $FreeBSD$
 
 KMOD=	vmm
 
 SRCS=	opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h pcib_if.h acpi_if.h
 DPSRCS+=	vmx_assym.h svm_assym.h
 DPSRCS+=	vmx_genassym.c svm_genassym.c offset.inc
 
-CFLAGS+= -DVMM_KEEP_STATS -DSMP
+CFLAGS+= -DVMM_KEEP_STATS
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/io
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/intel
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/amd
 
 # generic vmm support
 .PATH: ${SRCTOP}/sys/amd64/vmm
 SRCS+=	vmm.c		\
 	vmm_dev.c	\
 	vmm_host.c	\
 	vmm_instruction_emul.c	\
 	vmm_ioport.c	\
 	vmm_lapic.c	\
 	vmm_mem.c	\
 	vmm_stat.c	\
 	vmm_util.c	\
 	x86.c
 
 .PATH: ${SRCTOP}/sys/amd64/vmm/io
 SRCS+=	iommu.c		\
 	ppt.c           \
 	vatpic.c	\
 	vatpit.c	\
 	vhpet.c		\
 	vioapic.c	\
 	vlapic.c	\
 	vpmtmr.c	\
 	vrtc.c
 
 # intel-specific files
 .PATH: ${SRCTOP}/sys/amd64/vmm/intel
 SRCS+=	ept.c		\
 	vmcs.c		\
 	vmx_msr.c	\
 	vmx_support.S	\
 	vmx.c		\
 	vtd.c
 
 # amd-specific files
 .PATH: ${SRCTOP}/sys/amd64/vmm/amd
 SRCS+=	vmcb.c		\
 	svm.c		\
 	svm_support.S	\
 	npt.c		\
 	ivrs_drv.c	\
 	amdvi_hw.c	\
 	svm_msr.c
 
 CLEANFILES=	vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o
 
 OBJS_DEPEND_GUESS.vmx_support.o+= vmx_assym.h
 OBJS_DEPEND_GUESS.svm_support.o+= svm_assym.h
 
 vmx_assym.h:    vmx_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET}
 
 svm_assym.h:    svm_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh svm_genassym.o > ${.TARGET}
 
 vmx_support.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
 svm_support.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
 vmx_genassym.o: offset.inc
 	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
 
 svm_genassym.o: offset.inc
 	${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
 
 .include <bsd.kmod.mk>