time: Kill xtime_lock, replacing it with jiffies_lock

[~andy/linux] / kernel / time / jiffies.c

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 25f5b2699d3764f1ad546926d7c3017737d88a52..7a925ba456fb5d617d19b98daf2ca39356c4eca6 100644 (file)
--- 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);