diff options
author | John Stultz <john.stultz@linaro.org> | 2012-02-28 19:50:11 -0500 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2012-11-13 14:08:23 -0500 |
commit | d6ad418763888f617ac5b4849823e4cd670df1dd (patch) | |
tree | 92d75b05849f98e1a20eb8fa8bb8a26818707cd2 /include/linux/jiffies.h | |
parent | 47c8c91b2d60006df22146effe79ac4cdafd9205 (diff) |
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 'include/linux/jiffies.h')
-rw-r--r-- | include/linux/jiffies.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 6b87413da9d6..82ed068b1ebe 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
@@ -70,11 +70,12 @@ extern int register_refined_jiffies(long clock_tick_rate); | |||
70 | 70 | ||
71 | /* | 71 | /* |
72 | * The 64-bit value is not atomic - you MUST NOT read it | 72 | * The 64-bit value is not atomic - you MUST NOT read it |
73 | * without sampling the sequence number in xtime_lock. | 73 | * without sampling the sequence number in jiffies_lock. |
74 | * get_jiffies_64() will do this for you as appropriate. | 74 | * get_jiffies_64() will do this for you as appropriate. |
75 | */ | 75 | */ |
76 | extern u64 __jiffy_data jiffies_64; | 76 | extern u64 __jiffy_data jiffies_64; |
77 | extern unsigned long volatile __jiffy_data jiffies; | 77 | extern unsigned long volatile __jiffy_data jiffies; |
78 | extern seqlock_t jiffies_lock; | ||
78 | 79 | ||
79 | #if (BITS_PER_LONG < 64) | 80 | #if (BITS_PER_LONG < 64) |
80 | u64 get_jiffies_64(void); | 81 | u64 get_jiffies_64(void); |