The patch titled
x86_64: family 10h and 11h to k8topology
has been removed from the -mm tree. Its filename was
x86_64-family-10h-and-11h-to-k8topology.patch
This patch was dropped because it was nacked
------------------------------------------------------
Subject: x86_64: family 10h and 11h to k8topology
From: "Joachim Deguara" <[EMAIL PROTECTED]>
This just adds the PCI IDs of AMD's family 10h and 11h CPU's northbridges to
k8topology discovery.
Signed-off-by: Joachim Deguara <[EMAIL PROTECTED]>
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Acked-by: Yinghai Lu <[EMAIL PROTECTED]>
Cc: Christoph Lameter <[EMAIL PROTECTED]>
Cc: Len Brown <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/x86_64/mm/k8topology.c | 8 ++++++--
1 files 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 [EMAIL PROTECTED] are
git-cpufreq.patch
x86_64-family-10h-and-11h-to-k8topology.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
