diff --git a/[refs] b/[refs] index b42f66f257f1..4fd8d177a43b 100644 --- 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 index 82ed068b1ebe..8fb8edf12417 100644 --- 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 index cf3e59ed6dc0..f5c9207967cf 100644 --- a/trunk/kernel/time/tick-internal.h +++ b/trunk/kernel/time/tick-internal.h @@ -4,6 +4,8 @@ #include #include +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 index c442a4ccccc9..b0c648fc959f 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -23,6 +23,7 @@ #include #include +#include "tick-internal.h" static struct timekeeper timekeeper;