]> git.baikalelectronics.ru Git - kernel.git/commit
[PATCH] Revert nmi_known_cpu() check during boot option parsing
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Tue, 23 Jan 2007 04:40:34 +0000 (20:40 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 15:52:05 +0000 (07:52 -0800)
commit49718ff1072152343427a4be277ccb3c7611c0d4
tree4b188a931722c9f510f625eadb5ab02fc1ad55cd
parentbb9377e79a7835f293f93297cd4b420bbd64bb32
[PATCH] Revert nmi_known_cpu() check during boot option parsing

Commit da77066c410366f2d0746afd715aa9a7026b8a7c and its x86 version
(a72f011382b82a13e418214ec1ea78d2dc302440) adds nmi_known_cpu() check
while parsing boot options in x86_64 and i386.

With that, "nmi_watchdog=2" stops working for me on Intel Core 2 CPU
based system.

The problem is, setup_nmi_watchdog is called while parsing the boot
option and identify_cpu is not done yet.  So, the return value of
nmi_known_cpu() is not valid at this point.

So revert that check.  This should not have any adverse effect as the
nmi_known_cpu() check is done again later in enable_lapic_nmi_watchdog().

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/i386/kernel/nmi.c
arch/x86_64/kernel/nmi.c