The patch titled
fix nmi_watchdog=2 bootup hang
has been added to the -mm tree. Its filename is
fix-nmi_watchdog=2-bootup-hang-take-2.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix nmi_watchdog=2 bootup hang
From: Björn Steinbrink <B.Steinbrink@xxxxxx>
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@xxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-i386/paravirt.h | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN include/asm-i386/paravirt.h~fix-nmi_watchdog=2-bootup-hang-take-2 include/asm-i386/paravirt.h
--- a/include/asm-i386/paravirt.h~fix-nmi_watchdog=2-bootup-hang-take-2
+++ a/include/asm-i386/paravirt.h
@@ -542,7 +542,7 @@ static inline int paravirt_write_msr(uns
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 */
_
Patches currently in -mm which might be from B.Steinbrink@xxxxxx are
fix-nmi_watchdog=2-bootup-hang-take-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
