[xen staging] types: replace remaining uses of __u32

[patchbot@xxxxxxx]

commit 517cf3dbfd8195aac0fa08de9e2ccb22518ce828
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Oct 31 12:40:58 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Oct 31 12:40:58 2024 +0100

    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@xxxxxxxx>
    Reviewed-by: Frediano Ziglio <frediano.ziglio@xxxxxxxxx>
---
 xen/arch/x86/include/asm/byteorder.h | 2 +-
 xen/arch/x86/include/asm/msr.h       | 5 ++---
 xen/include/xen/bitops.h             | 4 ++--
 xen/include/xen/linux-compat.h       | 1 +
 xen/include/xen/types.h              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xen/arch/x86/include/asm/byteorder.h 
b/xen/arch/x86/include/asm/byteorder.h
index f3330af67e..44c240376d 100644
--- 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 355fb324ec..7ad66083a6 100644
--- 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 12eb88fb12..79615fb89d 100644
--- 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 59ba1e94bc..4f2b36a954 100644
--- 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 f4b5d9206a..a03ab1d1ef 100644
--- 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;
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging