leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] x86_64: Don't assume future AMD CPUs have K8 compatible performance counters

Browse Source 
The NMI watchdog code did this incorrectly

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2005-04-16 15:25:07 -07:00 committed by Linus Torvalds
parent 3a848f632f
commit 72e76be2fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86_64/kernel/nmi.c
View File

@ -336,7 +336,7 @@ void setup_apic_nmi_watchdog(void)
{ {
switch (boot_cpu_data.x86_vendor) { switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD: case X86_VENDOR_AMD:
if (boot_cpu_data.x86 < 6) if (boot_cpu_data.x86 != 15)
return; return;
if (strstr(boot_cpu_data.x86_model_id, "Screwdriver")) if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
return; return;