From: Thomas Gleixner <t...@linutronix.de> Move clocksource related stuff to timekeeping.h and remove the pointless include from ntp.c
Signed-off-by: Thomas Gleixner <t...@linutronix.de> [ rjw: Subject ] Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> --- kernel/time/clocksource.c | 2 +- kernel/time/jiffies.c | 2 +- kernel/time/ntp.c | 1 - kernel/time/tick-internal.h | 6 ------ kernel/time/timekeeping.h | 7 +++++++ 5 files changed, 9 insertions(+), 9 deletions(-) Index: linux-pm/kernel/time/clocksource.c =================================================================== --- linux-pm.orig/kernel/time/clocksource.c +++ linux-pm/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" /** Index: linux-pm/kernel/time/jiffies.c =================================================================== --- linux-pm.orig/kernel/time/jiffies.c +++ linux-pm/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 Index: linux-pm/kernel/time/ntp.c =================================================================== --- linux-pm.orig/kernel/time/ntp.c +++ linux-pm/kernel/time/ntp.c @@ -17,7 +17,6 @@ #include <linux/module.h> #include <linux/rtc.h> -#include "tick-internal.h" #include "ntp_internal.h" /* Index: linux-pm/kernel/time/tick-internal.h =================================================================== --- linux-pm.orig/kernel/time/tick-internal.h +++ linux-pm/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 @@ -168,5 +164,3 @@ int __clockevents_update_freq(struct clo #endif /* GENERIC_CLOCKEVENTS */ -extern void do_timer(unsigned long ticks); -extern void update_wall_time(void); Index: linux-pm/kernel/time/timekeeping.h =================================================================== --- linux-pm.orig/kernel/time/timekeeping.h +++ linux-pm/kernel/time/timekeeping.h @@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
