[PATCH] PCI/x86-64: build with PCI=n

From: Randy.Dunlap
Date: Tue Nov 30 2004 - 20:43:40 EST



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'

Signed-off-by: Randy Dunlap <rddunlap@xxxxxxxx>


diffstat:=
arch/i386/kernel/quirks.c | 3 ++-
arch/x86_64/Kconfig | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)

diff -Naurp ./arch/i386/kernel/quirks.c~config_pci ./arch/i386/kernel/quirks.c
--- ./arch/i386/kernel/quirks.c~config_pci 2004-11-15 10:01:58.430206024 -0800
+++ ./arch/i386/kernel/quirks.c 2004-11-16 11:24:25.204385552 -0800
@@ -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)
{
diff -Naurp ./arch/x86_64/Kconfig~config_pci ./arch/x86_64/Kconfig
--- ./arch/x86_64/Kconfig~config_pci 2004-11-15 10:01:58.985121664 -0800
+++ ./arch/x86_64/Kconfig 2004-11-16 10:50:00.987194264 -0800
@@ -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


---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/