---

yaml --- r: 366179 b: refs/heads/master c: eb93e4d h: refs/heads/master i: 366177: f558319 366175: f8735b9 v: v3
git-mirror · Mar 22, 2013 · 03023bc · 03023bc
1 parent 678b818
commit 03023bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23a9537a6999fce16f06ca61fc6cac52c8fbdc86
+refs/heads/master: eb93e4d93093615c60cb7dd3dcb24e46bd7d62d4
diff --git a/trunk/include/linux/jiffies.h b/trunk/include/linux/jiffies.h
@@ -75,7 +75,6 @@ extern int register_refined_jiffies(long clock_tick_rate);
  */
 extern u64 __jiffy_data jiffies_64;
 extern unsigned long volatile __jiffy_data jiffies;
-extern seqlock_t jiffies_lock;
 
 #if (BITS_PER_LONG < 64)
 u64 get_jiffies_64(void);

diff --git a/trunk/kernel/time/tick-internal.h b/trunk/kernel/time/tick-internal.h
@@ -4,6 +4,8 @@
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
 
+extern seqlock_t jiffies_lock;
+
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
 
 #define TICK_DO_TIMER_NONE	-1

diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -23,6 +23,7 @@
 #include <linux/stop_machine.h>
 #include <linux/pvclock_gtod.h>
 
+#include "tick-internal.h"
 
 static struct timekeeper timekeeper;