3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel J Blueman <daniel@xxxxxxxxxxxxx> commit 847d7970defb45540735b3fb4e88471c27cacd85 upstream. For systems with multiple servers and routed fabric, all northbridges get assigned to the first server. Fix this by also using the node reported from the PCI bus. For single-fabric systems, the northbriges are on PCI bus 0 by definition, which are on NUMA node 0 by definition, so this is invarient on most systems. Tested on fam10h and fam15h single and multi-fabric systems and candidate for stable. Signed-off-by: Daniel J Blueman <daniel@xxxxxxxxxxxxx> Acked-by: Steffen Persvold <sp@xxxxxxxxxxxxx> Acked-by: Borislav Petkov <bp@xxxxxxx> Link: http://lkml.kernel.org/r/1394710981-3596-1-git-send-email-daniel@xxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -525,7 +525,7 @@ static void __init quirk_amd_nb_node(str return; pci_read_config_dword(nb_ht, 0x60, &val); - node = val & 7; + node = pcibus_to_node(dev->bus) | (val & 7); /* * Some hardware may return an invalid node ID, * so check it first: -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html