From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932079AbZIQRqK (ORCPT ); Thu, 17 Sep 2009 13:46:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758728AbZIQRqH (ORCPT ); Thu, 17 Sep 2009 13:46:07 -0400 Received: from hera.kernel.org ([140.211.167.34]:60698 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758721AbZIQRqG (ORCPT ); Thu, 17 Sep 2009 13:46:06 -0400 Message-ID: <4AB275A1.8020005@kernel.org> Date: Thu, 17 Sep 2009 10:45:05 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: Ingo Molnar CC: Jesse Barnes , Rusty Russell , Tejun Heo , Linus Torvalds , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , "H. Peter Anvin" Subject: Re: [git pull] first round of PCI updates for 2.6.32 References: <20090915132105.2fdd1d45@jbarnes-g45> <20090917173012.GA11155@elte.hu> In-Reply-To: <20090917173012.GA11155@elte.hu> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo Molnar wrote: > * Jesse Barnes 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) {