| From 4a78c5af6700cc78dff65b33cbf227fd60f90508 Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:40 -0500 |
| Subject: [PATCH] rt: mutex x86 64 |
| |
| commit 92117778bba4272c0f020ce153ade27650fea35a in tip. |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h |
| index 3d61e20..81ccfb3 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 9055e58..6520c37 100644 |
| --- a/arch/x86/kernel/vsyscall_64.c |
| +++ b/arch/x86/kernel/vsyscall_64.c |
| @@ -59,7 +59,7 @@ int __vgetcpu_mode __section_vgetcpu_mode; |
| |
| struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data = |
| { |
| - .lock = SEQLOCK_UNLOCKED, |
| + .lock = __RAW_SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), |
| .sysctl_enabled = 1, |
| }; |
| |
| @@ -67,10 +67,10 @@ void update_vsyscall_tz(void) |
| { |
| unsigned long flags; |
| |
| - write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
| + write_raw_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); |
| + write_raw_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
| } |
| |
| void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, |
| @@ -78,7 +78,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, |
| { |
| unsigned long flags; |
| |
| - write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
| + write_raw_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; |
| @@ -89,7 +89,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, |
| vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; |
| vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; |
| vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); |
| - write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
| + write_raw_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
| } |
| |
| /* RED-PEN may want to readd seq locking, but then the variable should be |
| @@ -126,7 +126,7 @@ static __always_inline void do_vgettimeofday(struct timeval * tv) |
| unsigned long mult, shift, nsec; |
| cycle_t (*vread)(void); |
| do { |
| - seq = read_seqbegin(&__vsyscall_gtod_data.lock); |
| + seq = read_raw_seqbegin(&__vsyscall_gtod_data.lock); |
| |
| vread = __vsyscall_gtod_data.clock.vread; |
| if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) { |
| @@ -142,7 +142,7 @@ static __always_inline void do_vgettimeofday(struct timeval * tv) |
| |
| tv->tv_sec = __vsyscall_gtod_data.wall_time_sec; |
| nsec = __vsyscall_gtod_data.wall_time_nsec; |
| - } while (read_seqretry(&__vsyscall_gtod_data.lock, seq)); |
| + } while (read_raw_seqretry(&__vsyscall_gtod_data.lock, seq)); |
| |
| /* calculate interval: */ |
| cycle_delta = (now - base) & mask; |
| diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c |
| index ee55754..796ed12 100644 |
| --- a/arch/x86/vdso/vclock_gettime.c |
| +++ b/arch/x86/vdso/vclock_gettime.c |
| @@ -47,11 +47,11 @@ notrace static noinline int do_realtime(struct timespec *ts) |
| { |
| unsigned long seq, ns; |
| do { |
| - seq = read_seqbegin(>od->lock); |
| + seq = read_raw_seqbegin(>od->lock); |
| ts->tv_sec = gtod->wall_time_sec; |
| ts->tv_nsec = gtod->wall_time_nsec; |
| ns = vgetns(); |
| - } while (unlikely(read_seqretry(>od->lock, seq))); |
| + } while (unlikely(read_raw_seqretry(>od->lock, seq))); |
| timespec_add_ns(ts, ns); |
| return 0; |
| } |
| @@ -76,12 +76,12 @@ notrace static noinline int do_monotonic(struct timespec *ts) |
| { |
| unsigned long seq, ns, secs; |
| do { |
| - seq = read_seqbegin(>od->lock); |
| + seq = read_raw_seqbegin(>od->lock); |
| secs = gtod->wall_time_sec; |
| ns = gtod->wall_time_nsec + vgetns(); |
| secs += gtod->wall_to_monotonic.tv_sec; |
| ns += gtod->wall_to_monotonic.tv_nsec; |
| - } while (unlikely(read_seqretry(>od->lock, seq))); |
| + } while (unlikely(read_raw_seqretry(>od->lock, seq))); |
| vset_normalized_timespec(ts, secs, ns); |
| return 0; |
| } |
| -- |
| 1.7.1.1 |
| |