* [PATCH] fix amd_get_mmconfig_range link error
@ 2012-01-12 15:01 Bjorn Helgaas
2012-01-12 15:01 ` [PATCH] x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Helgaas @ 2012-01-12 15:01 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-pci, Jesse Barnes, Eric Dumazet, linux-kernel
This fixes a link error in current upstream when:
CONFIG_PCI=y
# CONFIG_AMD_NB not set
LD .tmp_vmlinux1
arch/x86/pci/built-in.o: In function `early_fill_mp_bus_info':
/opt/src/linux/arch/x86/pci/amd_bus.c:189: undefined reference to
`amd_get_mmconfig_range'
make: *** [.tmp_vmlinux1] Error 1
---
Bjorn Helgaas (1):
x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
arch/x86/pci/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
Bjorn
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
2012-01-12 15:01 [PATCH] fix amd_get_mmconfig_range link error Bjorn Helgaas
@ 2012-01-12 15:01 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2012-01-12 15:01 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-pci, Jesse Barnes, Eric Dumazet, linux-kernel
We only need amd_bus.o for AMD systems with PCI. arch/x86/pci/Makefile
already depends on CONFIG_PCI=y, so this patch just adds the dependency
on CONFIG_AMD_NB.
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: stable@kernel.org # 2.6.34+ (needs adjustment for k8 -> amd rename)
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/x86/pci/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 6b8759f..d24d3da 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_MRST) += mrst.o
obj-y += common.o early.o
-obj-y += amd_bus.o bus_numa.o
+obj-y += bus_numa.o
+obj-$(CONFIG_AMD_NB) += amd_bus.o
obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o
ifeq ($(CONFIG_PCI_DEBUG),y)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-12 15:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-12 15:01 [PATCH] fix amd_get_mmconfig_range link error Bjorn Helgaas
2012-01-12 15:01 ` [PATCH] x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®