From 412b0eab16c34e3945dab229656e4c089876f017 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:41 +0200
Subject: [PATCH] --- yaml --- r: 35975 b: refs/heads/master c:
 f157cbb1eb9ce3f33a401ec6d20eb3eb852351a3 h: refs/heads/master i:   35973:
 29b828175ff7c50ca803b140bdba5f3de963ae22   35971:
 fd227e01c23c560765b384bfa960a066c01495ee   35967:
 235b6c1be9777585a62070da1bf8eff709c1c14e v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/kernel/acpi/Makefile | 2 ++
 trunk/arch/i386/kernel/setup.c       | 2 ++
 trunk/arch/x86_64/Kconfig            | 3 ++-
 trunk/arch/x86_64/kernel/Makefile    | 3 ++-
 trunk/arch/x86_64/kernel/setup.c     | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a58ca050e9c7..42effa396487 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 658fdbef66e5e9be79b457edc2cbbb3add840aa9
+refs/heads/master: f157cbb1eb9ce3f33a401ec6d20eb3eb852351a3
diff --git a/trunk/arch/i386/kernel/acpi/Makefile b/trunk/arch/i386/kernel/acpi/Makefile
index 7e9ac99354f4..7f7be01f44e6 100644
--- a/trunk/arch/i386/kernel/acpi/Makefile
+++ b/trunk/arch/i386/kernel/acpi/Makefile
@@ -1,5 +1,7 @@
 obj-$(CONFIG_ACPI)		+= boot.o
+ifneq ($(CONFIG_PCI),)
 obj-$(CONFIG_X86_IO_APIC)	+= earlyquirk.o
+endif
 obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c
index ea17567dbe72..7a99b1369fa2 100644
--- a/trunk/arch/i386/kernel/setup.c
+++ b/trunk/arch/i386/kernel/setup.c
@@ -1437,9 +1437,11 @@ void __init setup_arch(char **cmdline_p)
 	acpi_boot_table_init();
 #endif
 
+#ifdef CONFIG_PCI
 #ifdef CONFIG_X86_IO_APIC
 	check_acpi_pci();	/* Checks more than just ACPI actually */
 #endif
+#endif
 
 #ifdef CONFIG_ACPI
 	acpi_boot_init();
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
index 1f4212605ef8..c2c68b902347 100644
--- a/trunk/arch/x86_64/Kconfig
+++ b/trunk/arch/x86_64/Kconfig
@@ -105,6 +105,7 @@ config X86_PC
 
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
+	depends on PCI
 	 help
 	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
 	  supposed to run on these EM64T-based machines.  Only choose this option
@@ -291,7 +292,7 @@ config NUMA
 
 config K8_NUMA
        bool "Old style AMD Opteron NUMA detection"
-       depends on NUMA
+       depends on NUMA && PCI
        default y
        help
 	 Enable K8 NUMA node topology detection.  You should say Y here if
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 000e67e8f028..2466fbd035ee 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process.o signal.o entry.o traps.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-		pci-dma.o pci-nommu.o alternative.o early-quirks.o
+		pci-dma.o pci-nommu.o alternative.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-$(CONFIG_X86_MCE)         += mce.o
@@ -39,6 +39,7 @@ obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)		+= audit.o
 
 obj-$(CONFIG_MODULES)		+= module.o
+obj-$(CONFIG_PCI)		+= early-quirks.o
 
 obj-y				+= topology.o
 obj-y				+= intel_cacheinfo.o
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 26524ce3b239..3d8309b1236e 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/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