fix nmi_watchdog=2 bootup hang

[sfrench/cifs-2.6.git] / include / asm-i386 / paravirt.h

diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h
index e2e7f98723c57fac6c3f45c797a1a7a1060df45a..7f846a7d6bcc080c634314d61759a9e691a6eac1 100644 (file)
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
@@ -222,11 +222,6 @@ struct paravirt_ops
        void (*iret)(void);
 };
 
-/* Mark a paravirt probe function. */
-#define paravirt_probe(fn)                                             \
- static asmlinkage void (*__paravirtprobe_##fn)(void) __attribute_used__ \
-               __attribute__((__section__(".paravirtprobe"))) = fn
-
 extern struct paravirt_ops paravirt_ops;
 
 #define PARAVIRT_PATCH(x)                                      \
@@ -544,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 */
@@ -560,11 +555,6 @@ static inline u64 paravirt_read_tsc(void)
 {
        return PVOP_CALL0(u64, read_tsc);
 }
-#define rdtsc(low,high) do {                   \
-       u64 _l = paravirt_read_tsc();           \
-       low = (u32)_l;                          \
-       high = _l >> 32;                        \
-} while(0)
 
 #define rdtscl(low) do {                       \
        u64 _l = paravirt_read_tsc();           \