Date: Wed, 14 Jan 2015 05:41:29 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277162 - in head/sys/modules: cardbus cbb Message-ID: <201501140541.t0E5fTtg069982@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Jan 14 05:41:28 2015 New Revision: 277162 URL: https://svnweb.freebsd.org/changeset/base/277162 Log: On x86 force NEW_PCIB, since that's the default. While this option would be picked up for kernel builds, it isn't picked up for old-fashioned builds. Without this option, PCI bus numbers are busted for modules build iteratively. Modified: head/sys/modules/cardbus/Makefile head/sys/modules/cbb/Makefile Modified: head/sys/modules/cardbus/Makefile ============================================================================== --- head/sys/modules/cardbus/Makefile Wed Jan 14 05:32:16 2015 (r277161) +++ head/sys/modules/cardbus/Makefile Wed Jan 14 05:41:28 2015 (r277162) @@ -6,4 +6,8 @@ KMOD= cardbus SRCS= cardbus.c cardbus_cis.c cardbus_device.c \ device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +CFLAGS += -DNEW_PCIB +.endif + .include <bsd.kmod.mk> Modified: head/sys/modules/cbb/Makefile ============================================================================== --- head/sys/modules/cbb/Makefile Wed Jan 14 05:32:16 2015 (r277161) +++ head/sys/modules/cbb/Makefile Wed Jan 14 05:41:28 2015 (r277162) @@ -6,4 +6,8 @@ KMOD= cbb SRCS= pccbb.c pccbb_isa.c pccbb_pci.c \ device_if.h bus_if.h power_if.h card_if.h isa_if.h pci_if.h pcib_if.h +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +CFLAGS += -DNEW_PCIB +.endif + .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501140541.t0E5fTtg069982>