openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

The sequence count in vgtod_data is unsigned int, but the call sites use
unsigned long, which is a pointless exercise. Fix the call sites and
replace 'unsigned' with unsinged 'int' while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Matt Rickard <matt@softrans.com.au>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: devel@linuxdriverproject.org
Cc: virtualization@lists.linux-foundation.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Juergen Gross <jgross@suse.com>
Link: https://lkml.kernel.org/r/20180917130707.236250416@linutronix.de
This commit is contained in:
Thomas Gleixner 2018-09-17 14:45:37 +02:00
parent a51e996d48
commit 77e9c678c5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/entry/vdso/vclock_gettime.c
View File

@ -208,7 +208,7 @@ notrace static inline u64 vgetsns(int *mode)
/* Code size doesn't matter (vdso is 4k anyway) and this is faster. */
notrace static int __always_inline do_realtime(struct timespec *ts)
{
unsigned long seq;
unsigned int seq;
u64 ns;
int mode;
@ -229,7 +229,7 @@ notrace static int __always_inline do_realtime(struct timespec *ts)
notrace static int __always_inline do_monotonic(struct timespec *ts)
{
unsigned long seq;
unsigned int seq;
u64 ns;
int mode;
@ -250,7 +250,7 @@ notrace static int __always_inline do_monotonic(struct timespec *ts)
notrace static void do_realtime_coarse(struct timespec *ts)
{
unsigned long seq;
unsigned int seq;
do {
seq = gtod_read_begin(gtod);
ts->tv_sec = gtod->wall_time_coarse_sec;
@ -260,7 +260,7 @@ notrace static void do_realtime_coarse(struct timespec *ts)
notrace static void do_monotonic_coarse(struct timespec *ts)
{
unsigned long seq;
unsigned int seq;
do {
seq = gtod_read_begin(gtod);
ts->tv_sec = gtod->monotonic_time_coarse_sec;

10
arch/x86/include/asm/vgtod.h
View File

@ -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 @@ static inline unsigned gtod_read_begin(const struct vsyscall_gtod_data *s)
}
static inline int gtod_read_retry(const struct vsyscall_gtod_data *s,
unsigned start)
unsigned int start)
{
smp_rmb();
return unlikely(s->seq != start);