Skip to contentSkip to conversation

PCI/x86-64: build with PCI=n

PATCH Applied Randy.Dunlap 2 participants 2 messages Dec 1, 2004 – Dec 9, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI/x86-64: build with PCI=n

Fix (most of) x64-64 kernel build for CONFIG_PCI=n. Fixes these 2 errors:

1. arch/x86_64/kernel/built-in.o(.text+0x8186): In function `quirk_intel_irqbalance':
: undefined reference to `raw_pci_ops'

Kconfig change:
2. arch/x86_64/kernel/pci-gart.c:194: error: `pci_bus_type' undeclared (first use in this function)

Still does not fix this one:
drivers/built-in.o(.text+0x3dcd8): In function `pnpacpi_allocated_resource':
: undefined reference to `pcibios_penalize_isa_irq'

diffstat:=

 arch/i386/kernel/quirks.c |    3 ++-
 arch/x86_64/Kconfig       |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/i386/kernel/quirks.c renamed from arch/i386/kernel/quirks.c~config_pci +2 -1
diff -Naurp ./arch/i386/kernel/quirks.c~config_pci ./arch/i386/kernel/quirks.c
@@ -1,10 +1,11 @@
 /*
  * This file contains work-arounds for x86 and x86_64 platform bugs.
  */
+#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP)
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
 
 void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
 {
arch/x86_64/Kconfig renamed from arch/x86_64/Kconfig~config_pci +1 -0
diff -Naurp ./arch/x86_64/Kconfig~config_pci ./arch/x86_64/Kconfig
@@ -306,6 +306,7 @@ config NR_CPUS
 
 config GART_IOMMU
 	bool "IOMMU support"
+	depends on PCI
 	help
 	  Support the K8 IOMMU. Needed to run systems with more than 4GB of memory
 	  properly with 32-bit PCI devices that do not support DAC (Double Address

---

Applied
#1 lore raw
Quoted 6 lines · Randy.Dunlap

Fix (most of) x64-64 kernel build for CONFIG_PCI=n. Fixes these 2 errors:

1. arch/x86_64/kernel/built-in.o(.text+0x8186): In function `quirk_intel_irqbalance':
: undefined reference to `raw_pci_ops'

Quoted 8 lines

Kconfig change:
2. arch/x86_64/kernel/pci-gart.c:194: error: `pci_bus_type' undeclared (first use in this function)

Still does not fix this one:
drivers/built-in.o(.text+0x3dcd8): In function `pnpacpi_allocated_resource':
: undefined reference to `pcibios_penalize_isa_irq'

Applied, thanks.

greg k-h