aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:41 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:41 -0400
commitf157cbb1eb9ce3f33a401ec6d20eb3eb852351a3 (patch)
tree8c3af952bac000951430ede5806582bcb62262ac /arch/x86_64
parent658fdbef66e5e9be79b457edc2cbbb3add840aa9 (diff)
[PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
This is useful on systems with broken PCI bus. Affects various scans in x86-64 and i386's early ACPI quirk scan. Cc: gregkh@suse.de Cc: len.brown@intel.com Cc: Trammell Hudson <hudson@osresearch.net> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/Kconfig3
-rw-r--r--arch/x86_64/kernel/Makefile3
-rw-r--r--arch/x86_64/kernel/setup.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 1f4212605ef8..c2c68b902347 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -105,6 +105,7 @@ config X86_PC
105 105
106config X86_VSMP 106config X86_VSMP
107 bool "Support for ScaleMP vSMP" 107 bool "Support for ScaleMP vSMP"
108 depends on PCI
108 help 109 help
109 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is 110 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
110 supposed to run on these EM64T-based machines. Only choose this option 111 supposed to run on these EM64T-based machines. Only choose this option
@@ -291,7 +292,7 @@ config NUMA
291 292
292config K8_NUMA 293config K8_NUMA
293 bool "Old style AMD Opteron NUMA detection" 294 bool "Old style AMD Opteron NUMA detection"
294 depends on NUMA 295 depends on NUMA && PCI
295 default y 296 default y
296 help 297 help
297 Enable K8 NUMA node topology detection. You should say Y here if 298 Enable K8 NUMA node topology detection. You should say Y here if
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 000e67e8f028..2466fbd035ee 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \
8 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \ 8 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
9 x8664_ksyms.o i387.o syscall.o vsyscall.o \ 9 x8664_ksyms.o i387.o syscall.o vsyscall.o \
10 setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \ 10 setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
11 pci-dma.o pci-nommu.o alternative.o early-quirks.o 11 pci-dma.o pci-nommu.o alternative.o
12 12
13obj-$(CONFIG_STACKTRACE) += stacktrace.o 13obj-$(CONFIG_STACKTRACE) += stacktrace.o
14obj-$(CONFIG_X86_MCE) += mce.o 14obj-$(CONFIG_X86_MCE) += mce.o
@@ -39,6 +39,7 @@ obj-$(CONFIG_K8_NB) += k8.o
39obj-$(CONFIG_AUDIT) += audit.o 39obj-$(CONFIG_AUDIT) += audit.o
40 40
41obj-$(CONFIG_MODULES) += module.o 41obj-$(CONFIG_MODULES) += module.o
42obj-$(CONFIG_PCI) += early-quirks.o
42 43
43obj-y += topology.o 44obj-y += topology.o
44obj-y += intel_cacheinfo.o 45obj-y += intel_cacheinfo.o
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 26524ce3b239..3d8309b1236e 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -493,7 +493,9 @@ void __init setup_arch(char **cmdline_p)
493 493
494 paging_init(); 494 paging_init();
495 495
496#ifdef CONFIG_PCI
496 early_quirks(); 497 early_quirks();
498#endif
497 499
498 /* 500 /*
499 * set this early, so we dont allocate cpu0 501 * set this early, so we dont allocate cpu0