The patch titled
x86_64: family 10h and 11h to k8topology
has been added to the -mm tree. Its filename is
x86_64-family-10h-and-11h-to-k8topology.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: family 10h and 11h to k8topology
From: "Joachim Deguara" <joachim.deguara@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Acked-by: Yinghai Lu <yinghai.lu@xxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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;
}
_
Patches currently in -mm which might be from joachim.deguara@xxxxxxx are
x86_64-family-10h-and-11h-to-k8topology.patch
documentation-update-sched-stattxt.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
