Re: [PATCH] ACPI: Unneccessary to scan the PCI bus already scanned.

Ingo Molnar
2008-03-03T10:11:13Z

* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> also please use attached patch to replace the one patch in x86.git#
> testing. old one can not be applied after Yakui's patch.

ok, thanks. Note, i still have the patch below filed up against it - is
that still needed?

Ingo

-------------->
Subject: x86: fix k8-bus_64.c build
From: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 20 10:30:15 CET 2008

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/pci/k8-bus_64.c | 6 ++++++
include/asm-x86/topology.h | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)

Index: linux-x86.q/arch/x86/pci/k8-bus_64.c
===================================================================
--- linux-x86.q.orig/arch/x86/pci/k8-bus_64.c
+++ linux-x86.q/arch/x86/pci/k8-bus_64.c
@@ -22,6 +22,8 @@
#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
#define PCI_DEVICE_ID_K8HTCONFIG 0x1100

+#ifdef CONFIG_NUMA
+
#define BUS_NR 256

static int mp_bus_to_node[BUS_NR];
@@ -51,6 +53,8 @@ int get_mp_bus_to_node(int busnum)
return node;
}

+#endif
+
/**
* early_fill_mp_bus_to_node()
* called before pcibios_scan_root and pci_scan_bus
@@ -60,6 +64,7 @@ int get_mp_bus_to_node(int busnum)
__init static int
early_fill_mp_bus_to_node(void)
{
+#ifdef CONFIG_NUMA
int i, j;
unsigned slot;
u32 ldtbus, nid;
@@ -111,6 +116,7 @@ early_fill_mp_bus_to_node(void)
if (node >= 0)
printk(KERN_DEBUG "bus: %02x to node: %02x\n", i, node);
}
+#endif
return 0;
}

Index: linux-x86.q/include/asm-x86/topology.h
===================================================================
--- linux-x86.q.orig/include/asm-x86/topology.h
+++ linux-x86.q/include/asm-x86/topology.h
@@ -165,8 +165,8 @@ extern int __node_distance(int, int);
#define node_distance(a, b) __node_distance(a, b)
#endif

-int get_mp_bus_to_node(int busnum);
-void set_mp_bus_to_node(int busnum, int node);
+extern int get_mp_bus_to_node(int busnum);
+extern void set_mp_bus_to_node(int busnum, int node);

#else /* CONFIG_NUMA */