sync vapier-m

[patches.git] / linux-use-__-types-in-x86-64-msr.patch

Use __u32 rather than u32 in checking_wrmsrl() exported to userspace.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -2,6 +2,9 @@
 #define X86_64_MSR_H 1
 
 #ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
 /*
  * Access to machine-specific registers (available on 586 and better only)
  * Note: the rd* operations modify the parameters directly (without using
@@ -43,7 +46,7 @@
 		     : "c" (msr), "0" (a), "d" (b), "i" (-EFAULT)); \
 	ret__; })
 
-#define checking_wrmsrl(msr,val) wrmsr_safe(msr,(u32)(val),(u32)((val)>>32))
+#define checking_wrmsrl(msr,val) wrmsr_safe(msr,(__u32)(val),(__u32)((val)>>32))
 
 #define rdmsr_safe(msr,a,b) \
 	({ int ret__;						\