Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0a4599c894d880763eec6cb93f6c246dac6c3269
Commit: 0a4599c894d880763eec6cb93f6c246dac6c3269
Parent: f790cd30d002949a12623b2a8cec4d4e5a8887ef
Author: Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 13 13:26:25 2007 +0100
Committer: Andi Kleen <[EMAIL PROTECTED]>
CommitDate: Tue Feb 13 13:26:25 2007 +0100
[PATCH] x86: Enable NMI watchdog for AMD Family 0x10 CPUs
For i386/x86-64.
Straight forward -- just reuse the Family 0xf code.
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
---
arch/i386/kernel/nmi.c | 6 ++++--
arch/x86_64/kernel/nmi.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index b11abac..5d8a07c 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -185,7 +185,8 @@ static __cpuinit inline int nmi_known_cpu(void)
{
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
- return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6));
+ return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6)
+ || (boot_cpu_data.x86 == 16));
case X86_VENDOR_INTEL:
if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
return 1;
@@ -817,7 +818,8 @@ void setup_apic_nmi_watchdog (void *unused)
if (nmi_watchdog == NMI_LOCAL_APIC) {
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
- if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15)
+ if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
+ boot_cpu_data.x86 != 16)
return;
if (!setup_k7_watchdog())
return;
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 269fe58..486f4c6 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -172,7 +172,7 @@ static __cpuinit inline int nmi_known_cpu(void)
{
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
- return boot_cpu_data.x86 == 15;
+ return boot_cpu_data.x86 == 15 || boot_cpu_data.x86 == 16;
case X86_VENDOR_INTEL:
if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
return 1;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
