Commit:     b9e3614f444f6546204f4538afcaa3ebe36d49f2
Parent:     189548642c5962e60c3667bdb3a703fe0bed12a6
Author:     Björn Steinbrink <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 25 23:04:37 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jun 25 14:54:52 2007 -0700

    fix nmi_watchdog=2 bootup hang
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-i386/paravirt.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h
index d7a0512..7f846a7 100644
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
@@ -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)), 
 #define wrmsr_safe(msr,a,b)    paravirt_write_msr(msr, a, b)
 /* rdmsr with exception handling */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to