types: replace remaining uses of __u32

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

While doing so drop casts (instead of modiyfing them) from x86'es
wrmsrl().

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

diff --git a/xen/arch/x86/include/asm/byteorder.h b/xen/arch/x86/include/asm/byteorder.h
index f3330af67e6770c8b0ae4e5b08b33574f0fd968d..44c240376d3a17f683beabd6327cd016b83574f9 100644 (file)
--- a/xen/arch/x86/include/asm/byteorder.h
+++ b/xen/arch/x86/include/asm/byteorder.h
@@ -4,7 +4,7 @@
 #include <xen/types.h>
 #include <xen/compiler.h>
 
-static inline attr_const __u32 ___arch__swab32(__u32 x)
+static inline attr_const uint32_t ___arch__swab32(uint32_t x)
 {
     asm("bswap %0" : "=r" (x) : "0" (x));
     return x;

diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h
index 355fb324ec0b3dd577954c6996746d036e32862b..7ad66083a67517918433d3b9974be6f494f09883 100644 (file)
--- a/xen/arch/x86/include/asm/msr.h
+++ b/xen/arch/x86/include/asm/msr.h
@@ -33,9 +33,8 @@
 
 static inline void wrmsrl(unsigned int msr, __u64 val)
 {
-        __u32 lo, hi;
-        lo = (__u32)val;
-        hi = (__u32)(val >> 32);
+        uint32_t lo = val, hi = val >> 32;
+
         wrmsr(msr, lo, hi);
 }
 

diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
index 12eb88fb1255a7bc0c11fe4a3ca5601db4639245..79615fb89d040d2f25bca13c393eb41ae507f46c 100644 (file)
--- a/xen/include/xen/bitops.h
+++ b/xen/include/xen/bitops.h
@@ -413,7 +413,7 @@ static inline int get_count_order(unsigned int count)
  * @word: value to rotate
  * @shift: bits to roll
  */
-static inline __u32 rol32(__u32 word, unsigned int shift)
+static inline uint32_t rol32(uint32_t word, unsigned int shift)
 {
     return (word << shift) | (word >> (32 - shift));
 }
@@ -424,7 +424,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
  * @word: value to rotate
  * @shift: bits to roll
  */
-static inline __u32 ror32(__u32 word, unsigned int shift)
+static inline uint32_t ror32(uint32_t word, unsigned int shift)
 {
     return (word >> shift) | (word << (32 - shift));
 }

diff --git a/xen/include/xen/linux-compat.h b/xen/include/xen/linux-compat.h
index 59ba1e94bc7a0fb4a068f147f0c075acf6317b66..4f2b36a9544b807c3878f4850529dfd1c478a004 100644 (file)
--- a/xen/include/xen/linux-compat.h
+++ b/xen/include/xen/linux-compat.h
@@ -16,6 +16,7 @@ typedef uint8_t __u8;
 typedef int16_t s16, __s16;
 typedef uint16_t __u16;
 typedef int32_t s32, __s32;
+typedef uint32_t __u32;
 typedef int64_t s64, __s64;
 
 typedef paddr_t phys_addr_t;

diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index f4b5d9206ab9f7c236552154d93f212605d18bfe..a03ab1d1ef2f6c8ea945fdab7c52e677075d3e2e 100644 (file)
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -7,7 +7,7 @@
 /* Linux inherited types which are being phased out */
 typedef uint8_t u8;
 typedef uint16_t u16;
-typedef uint32_t u32, __u32;
+typedef uint32_t u32;
 typedef uint64_t u64, __u64;
 
 #include <asm/types.h>
@@ -53,8 +53,8 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
 typedef uint16_t __le16;
 typedef uint16_t __be16;
-typedef __u32 __le32;
-typedef __u32 __be32;
+typedef uint32_t __le32;
+typedef uint32_t __be32;
 typedef __u64 __le64;
 typedef __u64 __be64;