From: "Joachim Deguara" <joachim.deguara@amd.com>

This just adds the PCI IDs of AMD's family 10h and 11h CPU's northbridges to
k8topology discovery.

Signed-off-by: Joachim Deguara <joachim.deguara@amd.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86_64/mm/k8topology.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff -puN arch/x86_64/mm/k8topology.c~x86_64-family-10h-and-11h-to-k8topology arch/x86_64/mm/k8topology.c
--- a/arch/x86_64/mm/k8topology.c~x86_64-family-10h-and-11h-to-k8topology
+++ a/arch/x86_64/mm/k8topology.c
@@ -28,11 +28,15 @@ static __init int find_northbridge(void)
 		u32 header;
 		
 		header = read_pci_config(0, num, 0, 0x00);  
-		if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)))
+		if ((header != (PCI_VENDOR_ID_AMD | (0x1100<<16))) &&
+		    (header != (PCI_VENDOR_ID_AMD | (0x1200<<16))) &&
+		    (header != (PCI_VENDOR_ID_AMD | (0x1300<<16))))
 			continue; 	
 
 		header = read_pci_config(0, num, 1, 0x00); 
-		if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)))
+		if ((header != (PCI_VENDOR_ID_AMD | (0x1101<<16))) &&
+		    (header != (PCI_VENDOR_ID_AMD | (0x1201<<16))) &&
+		    (header != (PCI_VENDOR_ID_AMD | (0x1301<<16))))
 			continue;	
 		return num; 
 	} 
_