Re: [git pull] first round of PCI updates for 2.6.32

From: Yinghai Lu
Date: Thu Sep 17 2009 - 13:46:18 EST


Ingo Molnar wrote:
> * Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:
>
>> The following changes since commit 332a3392188e0ad966543c87b8da2b9d246f301d:
>> Linus Torvalds (1):
>> Merge git://git.kernel.org/.../herbert/crypto-2.6
>
> Since this went upstream -tip tests have been triggering nasty bootup
> crashes in the PCI code:
>
> [ 4.366174] initcall pci_proc_init+0x0/0x7a returned 0 after 976 usecs
> [ 4.373009] calling pcie_portdrv_init+0x0/0x60 @ 1
> [ 4.378368] bus: 'pci_express': registered
> [ 4.382009] bus: 'pci': add driver pcieport-driver
> [ 4.387058] bus: 'pci': driver_probe_device: matched device 0000:00:0b.0 with driver pcieport-driver
> [ 4.396005] bus: 'pci': really_probe: probing driver pcieport-driver with device 0000:00:0b.0
> [ 4.404056] cpumask_of_node(255): node > nr_node_ids(16)

please check

[PATCH] x86/pci: retore 32bit to node0 as default node

to fix crash on 32bit system

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 5db96d4..e562ade 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -646,9 +646,7 @@ int get_mp_bus_to_node(int busnum)

#else /* CONFIG_X86_32 */

-static unsigned char mp_bus_to_node[BUS_NR] = {
- [0 ... BUS_NR - 1] = -1
-};
+static unsigned char mp_bus_to_node[BUS_NR];

void set_mp_bus_to_node(int busnum, int node)
{
--
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/