diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-25 19:43:27 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:28:31 -0600 |
| commit | 6b29bf191aecbee6c5c230fbac598e86c2683b8d (patch) | |
| tree | c94a9100d016c08f82f3c81caa6e357231187b16 /arch | |
| parent | ca9381513adeb8ae80f06152abfeb4237d4d0d54 (diff) | |
timekeeping: Convert xtime_lock to raw_seqlock
Convert xtime_lock to raw_seqlock and fix up all users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/time.c | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/vgtod.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 43920de425f1..6782b710f1de 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -36,7 +36,7 @@ static cycle_t itc_get_cycles(struct clocksource *cs); struct fsyscall_gtod_data_t fsyscall_gtod_data = { - .lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock), + .lock = __RAW_SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock), }; struct itc_jitter_data_t itc_jitter_data; @@ -462,7 +462,7 @@ void update_vsyscall(struct timespec *wall, struct timespec *wtm, { unsigned long flags; - write_seqlock_irqsave(&fsyscall_gtod_data.lock, flags); + raw_write_seqlock_irqsave(&fsyscall_gtod_data.lock, flags); /* copy fsyscall clock data */ fsyscall_gtod_data.clk_mask = c->mask; @@ -485,6 +485,6 @@ void update_vsyscall(struct timespec *wall, struct timespec *wtm, fsyscall_gtod_data.monotonic_time.tv_sec++; } - write_sequnlock_irqrestore(&fsyscall_gtod_data.lock, flags); + raw_write_sequnlock_irqrestore(&fsyscall_gtod_data.lock, flags); } diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h index 815285bcaceb..0440e3700f67 100644 --- a/arch/x86/include/asm/vgtod.h +++ b/arch/x86/include/asm/vgtod.h @@ -5,7 +5,7 @@ #include <linux/clocksource.h> struct vsyscall_gtod_data { - seqlock_t lock; + raw_seqlock_t lock; /* open coded 'struct timespec' */ time_t wall_time_sec; diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index e4d4a22e8b94..aad7aaf319e1 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -54,7 +54,7 @@ DEFINE_VVAR(int, vgetcpu_mode); DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = { - .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), + .lock = __RAW_SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), }; static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE; @@ -82,10 +82,10 @@ void update_vsyscall_tz(void) { unsigned long flags; - write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); + raw_write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* sys_tz has changed */ vsyscall_gtod_data.sys_tz = sys_tz; - write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); + raw_write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); } void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, @@ -93,7 +93,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, { unsigned long flags; - write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); + raw_write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* copy vsyscall data */ vsyscall_gtod_data.clock.vclock_mode = clock->archdata.vclock_mode; @@ -106,7 +106,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, vsyscall_gtod_data.wall_to_monotonic = *wtm; vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); - write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); + raw_write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); } static void warn_bad_vsyscall(const char *level, struct pt_regs *regs, |