x86/vdso: Use unsigned int consistently for vsyscall_gtod_data:: Seq

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / vgtod.h

diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 53748541c487ab00d8bd1ee9b4d05305aa33171d..91cad1f01027bb9126a21fb4d41c012886fc2c39 100644 (file)
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -15,9 +15,9 @@ typedef unsigned long gtod_long_t;
  * so be carefull by modifying this structure.
  */
 struct vsyscall_gtod_data {
-       unsigned seq;
+       unsigned int seq;
 
-       int vclock_mode;
+       int     vclock_mode;
        u64     cycle_last;
        u64     mask;
        u32     mult;
@@ -44,9 +44,9 @@ static inline bool vclock_was_used(int vclock)
        return READ_ONCE(vclocks_used) & (1 << vclock);
 }
 
-static inline unsigned gtod_read_begin(const struct vsyscall_gtod_data *s)
+static inline unsigned int gtod_read_begin(const struct vsyscall_gtod_data *s)
 {
-       unsigned ret;
+       unsigned int ret;
 
 repeat:
        ret = READ_ONCE(s->seq);
@@ -59,7 +59,7 @@ repeat:
 }
 
 static inline int gtod_read_retry(const struct vsyscall_gtod_data *s,
-                                       unsigned start)
+                                 unsigned int start)
 {
        smp_rmb();
        return unlikely(s->seq != start);