| From 3a6cd6132a93857582147653cba28307ed37f5c9 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 00:03:24 -0500 |
| Subject: [PATCH] read_seq --> read_raw_seq for vdso |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| See it in a git tip repo with: |
| |
| git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ |
| 5f854cfc024622e4aae14d7cf422f6ff86278688 \ |
| arch/x86/vdso/vclock_gettime.c |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c |
| index 796ed12..e1b68a5 100644 |
| --- a/arch/x86/vdso/vclock_gettime.c |
| +++ b/arch/x86/vdso/vclock_gettime.c |
| @@ -90,10 +90,10 @@ notrace static noinline int do_realtime_coarse(struct timespec *ts) |
| { |
| unsigned long seq; |
| do { |
| - seq = read_seqbegin(>od->lock); |
| + seq = read_raw_seqbegin(>od->lock); |
| ts->tv_sec = gtod->wall_time_coarse.tv_sec; |
| ts->tv_nsec = gtod->wall_time_coarse.tv_nsec; |
| - } while (unlikely(read_seqretry(>od->lock, seq))); |
| + } while (unlikely(read_raw_seqretry(>od->lock, seq))); |
| return 0; |
| } |
| |
| @@ -101,12 +101,12 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts) |
| { |
| unsigned long seq, ns, secs; |
| do { |
| - seq = read_seqbegin(>od->lock); |
| + seq = read_raw_seqbegin(>od->lock); |
| secs = gtod->wall_time_coarse.tv_sec; |
| ns = gtod->wall_time_coarse.tv_nsec; |
| 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 |
| |