]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fix nmi_watchdog=2 bootup hang
authorBjörn Steinbrink <B.Steinbrink@gmx.de>
Mon, 25 Jun 2007 21:04:37 +0000 (23:04 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 25 Jun 2007 21:54:52 +0000 (14:54 -0700)
wrmsrl() is broken, dropping the upper 32bits of the value to be
written. This broke the NMI watchdog on AMD hardware. (and it
probably broke other code too.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-i386/paravirt.h

index d7a0512f88e0a9a148a815e16a1146c0efe59985..7f846a7d6bcc080c634314d61759a9e691a6eac1 100644 (file)
@@ -539,7 +539,7 @@ static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)
        val = paravirt_read_msr(msr, &_err);    \
 } while(0)
 
-#define wrmsrl(msr,val)                ((void)paravirt_write_msr(msr, val, 0))
+#define wrmsrl(msr,val)                wrmsr(msr, (u32)((u64)(val)), ((u64)(val))>>32)
 #define wrmsr_safe(msr,a,b)    paravirt_write_msr(msr, a, b)
 
 /* rdmsr with exception handling */