diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-02-29 01:50:11 +0100 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-11-13 20:08:23 +0100 |
| commit | d6ad418763888f617ac5b4849823e4cd670df1dd (patch) | |
| tree | 92d75b05849f98e1a20eb8fa8bb8a26818707cd2 /kernel/time/jiffies.c | |
| parent | clocksource: arm_generic: use this_cpu_ptr per-cpu helper (diff) | |
| download | linux-d6ad418763888f617ac5b4849823e4cd670df1dd.tar.xz linux-d6ad418763888f617ac5b4849823e4cd670df1dd.zip | |
time: Kill xtime_lock, replacing it with jiffies_lock
Now that timekeeping is protected by its own locks, rename
the xtime_lock to jifffies_lock to better describe what it
protects.
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/jiffies.c')
| -rw-r--r-- | kernel/time/jiffies.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index 25f5b2699d37..7a925ba456fb 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -67,6 +67,8 @@ static struct clocksource clocksource_jiffies = { .shift = JIFFIES_SHIFT, }; +__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock); + #if (BITS_PER_LONG < 64) u64 get_jiffies_64(void) { @@ -74,9 +76,9 @@ u64 get_jiffies_64(void) u64 ret; do { - seq = read_seqbegin(&xtime_lock); + seq = read_seqbegin(&jiffies_lock); ret = jiffies_64; - } while (read_seqretry(&xtime_lock, seq)); + } while (read_seqretry(&jiffies_lock, seq)); return ret; } EXPORT_SYMBOL(get_jiffies_64); |