Date: Wed, 17 Jun 2009 14:45:58 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r194365 - in stable/7/sys: . contrib/pf dev/ath/ath_hal modules/linux Message-ID: <200906171445.n5HEjwb9078773@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Jun 17 14:45:58 2009 New Revision: 194365 URL: http://svn.freebsd.org/changeset/base/194365 Log: merge r192852, r192855: opt_apic.h is only used on i386. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/modules/linux/Makefile Modified: stable/7/sys/modules/linux/Makefile ============================================================================== --- stable/7/sys/modules/linux/Makefile Wed Jun 17 14:32:08 2009 (r194364) +++ stable/7/sys/modules/linux/Makefile Wed Jun 17 14:45:58 2009 (r194365) @@ -17,7 +17,10 @@ SRCS= linux${SFX}_dummy.c linux_emul.c l device_if.h bus_if.h assym.s # XXX: for assym.s -SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h +SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h +.if ${MACHINE_ARCH} == "i386" +SRCS+= opt_apic.h +.endif OBJS= linux${SFX}_locore.o linux${SFX}_support.o
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906171445.n5HEjwb9078773>