summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorAndi Kleen2006-09-26 10:52:41 +0200
committerAndi Kleen2006-09-26 10:52:41 +0200
commitf157cbb1eb9ce3f33a401ec6d20eb3eb852351a3 (patch)
tree8c3af952bac000951430ede5806582bcb62262ac /arch/x86_64/kernel/setup.c
parent[PATCH] Don't leak NT bit into next task (diff)
downloadkernel-qcow2-linux-f157cbb1eb9ce3f33a401ec6d20eb3eb852351a3.tar.gz
kernel-qcow2-linux-f157cbb1eb9ce3f33a401ec6d20eb3eb852351a3.tar.xz
kernel-qcow2-linux-f157cbb1eb9ce3f33a401ec6d20eb3eb852351a3.zip
[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/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
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)
paging_init();
+#ifdef CONFIG_PCI
early_quirks();
+#endif
/*
* set this early, so we dont allocate cpu0