]> git.hungrycats.org Git - linux/commit
[PATCH] Fix oops with nmi-watchdog=2
authorPhilippe Elie <phil.el@wanadoo.fr>
Tue, 31 Aug 2004 03:31:55 +0000 (20:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 31 Aug 2004 03:31:55 +0000 (20:31 -0700)
commit5ae3fd759fcfb8ef033f2279e3f5a1515ec702c6
tree3e22634057dadf649ae723111ad78dd4162e72b3
parent75b02c33c4b32491c1d3c8bea0945282aa05b516
[PATCH] Fix oops with nmi-watchdog=2

Contributions from  Zarakin <zarakin@hotpop.com>

Intel removed two msrs: MSR_P4_IQ_ESCR_0|1 (0x3ba/0x3bb), P4 model >= 3.  See
Intel documentation Vol.  3 System Programming Guide Appendix B.

nmi_watchdog=2 oopsed at boot time and oprofile at driver load.

Avoid touching them when model >= 3.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/nmi.c
arch/i386/oprofile/op_model_p4.c