Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45710
b: refs/heads/master
c: 58d9ce7
h: refs/heads/master
v: v3
  • Loading branch information
Venkatesh Pallipadi authored and Linus Torvalds committed Jan 23, 2007
1 parent 9a7302b commit 25b515d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bbe1a59b3a3d4af3869647d294618a23f6c9c6a4
refs/heads/master: 58d9ce7d751fa11c6c8ea5dcd4d63b320aae1363
8 changes: 1 addition & 7 deletions trunk/arch/i386/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,7 @@ static int __init setup_nmi_watchdog(char *str)

if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE))
return 0;
/*
* If any other x86 CPU has a local APIC, then
* please test the NMI stuff there and send me the
* missing bits. Right now Intel P6/P4 and AMD K7 only.
*/
if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0))
return 0; /* no lapic support */

nmi_watchdog = nmi;
return 1;
}
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/x86_64/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,6 @@ int __init setup_nmi_watchdog(char *str)
if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE))
return 0;

if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0))
return 0; /* no lapic support */
nmi_watchdog = nmi;
return 1;
}
Expand Down

0 comments on commit 25b515d

Please sign in to comment.