diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-03-25 13:06:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-01 14:22:58 +0200 |
| commit | bfb83b27519aa7ed9510f601a8f825a2c1484bc2 (patch) | |
| tree | 2c33a1b534072ad2bad82fe062b21424ed7f457e /kernel | |
| parent | 9f083b74df3a7eaa100b456f2dc195512daf728e (diff) | |
tick: Move clocksource related stuff to timekeeping.h
Move clocksource related stuff to timekeeping.h and remove the
pointless include from ntp.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/2714218.nM5AEfAHj0@vostro.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clocksource.c | 2 | ||||
| -rw-r--r-- | kernel/time/jiffies.c | 2 | ||||
| -rw-r--r-- | kernel/time/ntp.c | 1 | ||||
| -rw-r--r-- | kernel/time/tick-internal.h | 6 | ||||
| -rw-r--r-- | kernel/time/timekeeping.h | 7 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index c3be3c71bbad..8b4010f0b1b4 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -31,7 +31,7 @@ #include <linux/tick.h> #include <linux/kthread.h> -#include "tick-internal.h" +#include "timekeeping.h" #include "timekeeping_internal.h" /** diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index c4bb518725b5..347fecf86a3f 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -25,7 +25,7 @@ #include <linux/module.h> #include <linux/init.h> -#include "tick-internal.h" +#include "timekeeping.h" /* The Jiffies based clocksource is the lowest common * denominator clock source which should function on diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 0f60b08a4f07..9ad60d028508 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -17,7 +17,6 @@ #include <linux/module.h> #include <linux/rtc.h> -#include "tick-internal.h" #include "ntp_internal.h" /* diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index c7b75bec27f2..cba52140a298 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -6,10 +6,6 @@ #include "timekeeping.h" -extern seqlock_t jiffies_lock; - -#define CS_NAME_LEN 32 - #ifdef CONFIG_GENERIC_CLOCKEVENTS #define TICK_DO_TIMER_NONE -1 @@ -169,5 +165,3 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); #endif /* GENERIC_CLOCKEVENTS */ -extern void do_timer(unsigned long ticks); -extern void update_wall_time(void); diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h index 1d91416055d5..ead8794b9a4e 100644 --- a/kernel/time/timekeeping.h +++ b/kernel/time/timekeeping.h @@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct timespec *ts); extern int timekeeping_suspend(void); extern void timekeeping_resume(void); +extern void do_timer(unsigned long ticks); +extern void update_wall_time(void); + +extern seqlock_t jiffies_lock; + +#define CS_NAME_LEN 32 + #endif |