types: replace remaining use of __u64

... and move the type itself to linux-compat.h.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Frediano Ziglio <frediano.ziglio@cloud.com>

diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h
index 7ad66083a67517918433d3b9974be6f494f09883..7b00a4db5d48f1248b82a7c57d002a781e2bd954 100644 (file)
--- a/xen/arch/x86/include/asm/msr.h
+++ b/xen/arch/x86/include/asm/msr.h
@@ -31,7 +31,7 @@
                          : /* no outputs */ \
                          : "c" (msr), "a" (val1), "d" (val2))
 
-static inline void wrmsrl(unsigned int msr, __u64 val)
+static inline void wrmsrl(unsigned int msr, uint64_t val)
 {
         uint32_t lo = val, hi = val >> 32;
 

diff --git a/xen/include/xen/linux-compat.h b/xen/include/xen/linux-compat.h
index 4f2b36a9544b807c3878f4850529dfd1c478a004..cdbc0dfde02d6a41bcdd4851793331c429f5ea3c 100644 (file)
--- a/xen/include/xen/linux-compat.h
+++ b/xen/include/xen/linux-compat.h
@@ -18,6 +18,7 @@ typedef uint16_t __u16;
 typedef int32_t s32, __s32;
 typedef uint32_t __u32;
 typedef int64_t s64, __s64;
+typedef uint64_t __u64;
 
 typedef paddr_t phys_addr_t;
 

diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index a03ab1d1ef2f6c8ea945fdab7c52e677075d3e2e..543bfb2159b18c99ae543928e4db400f39239bf1 100644 (file)
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -8,7 +8,7 @@
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
-typedef uint64_t u64, __u64;
+typedef uint64_t u64;
 
 #include <asm/types.h>
 
@@ -55,8 +55,8 @@ typedef uint16_t __le16;
 typedef uint16_t __be16;
 typedef uint32_t __le32;
 typedef uint32_t __be32;
-typedef __u64 __le64;
-typedef __u64 __be64;
+typedef uint64_t __le64;
+typedef uint64_t __be64;
 
 typedef unsigned int __attribute__((__mode__(__pointer__))) uintptr_t;