diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2012-03-06 10:33:59 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-06 11:09:21 -0500 |
| commit | 08a23fe93259a7dfbbb7dd8179cecd165fe5d9eb (patch) | |
| tree | 890064de4b900a72a697731ea8fd4fc4784b7c21 /arch | |
| parent | a60fb29b526aeaa34482a062ba4244948c0b9bf1 (diff) | |
revert-convert-xtime_lock-to-raw_seqlock
revert: timekeeping: Convert xtime_lock to raw_seqlock
Revert:
Author: Thomas Gleixner <tglx@linutronix.de>
Date: Sat Jul 25 19:43:27 2009 +0200
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>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
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 604a6365f61c..85118dfe9bb5 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 = __RAW_SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock), + .lock = __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; - raw_write_seqlock_irqsave(&fsyscall_gtod_data.lock, flags); + 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++; } - raw_write_sequnlock_irqrestore(&fsyscall_gtod_data.lock, flags); + 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 4f72846195cb..646b4c1ca695 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 { - raw_seqlock_t lock; + 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 bbcbaaaeb6e5..3e682184d76c 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -52,7 +52,7 @@ DEFINE_VVAR(int, vgetcpu_mode); DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = { - .lock = __RAW_SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), + .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), .sysctl_enabled = 1, }; @@ -60,10 +60,10 @@ void update_vsyscall_tz(void) { unsigned long flags; - raw_write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); + write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* sys_tz has changed */ vsyscall_gtod_data.sys_tz = sys_tz; - raw_write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); + write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); } void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, @@ -71,7 +71,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, { unsigned long flags; - raw_write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); + write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* copy vsyscall data */ vsyscall_gtod_data.clock.vread = clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; @@ -82,7 +82,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.wall_to_monotonic = *wtm; vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); - raw_write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); + write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); } /* RED-PEN may want to readd seq locking, but then the variable should be |