Commit bfb83b27 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

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: default avatarThomas Gleixner <tglx@linutronix.de>
[ rjw: Subject ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/2714218.nM5AEfAHj0@vostro.rjw.lanSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9f083b74
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include "tick-internal.h" #include "timekeeping.h"
#include "timekeeping_internal.h" #include "timekeeping_internal.h"
/** /**
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include "tick-internal.h" #include "timekeeping.h"
/* The Jiffies based clocksource is the lowest common /* The Jiffies based clocksource is the lowest common
* denominator clock source which should function on * denominator clock source which should function on
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include "tick-internal.h"
#include "ntp_internal.h" #include "ntp_internal.h"
/* /*
......
...@@ -6,10 +6,6 @@ ...@@ -6,10 +6,6 @@
#include "timekeeping.h" #include "timekeeping.h"
extern seqlock_t jiffies_lock;
#define CS_NAME_LEN 32
#ifdef CONFIG_GENERIC_CLOCKEVENTS #ifdef CONFIG_GENERIC_CLOCKEVENTS
#define TICK_DO_TIMER_NONE -1 #define TICK_DO_TIMER_NONE -1
...@@ -169,5 +165,3 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); ...@@ -169,5 +165,3 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
#endif /* GENERIC_CLOCKEVENTS */ #endif /* GENERIC_CLOCKEVENTS */
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);
...@@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct timespec *ts); ...@@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct timespec *ts);
extern int timekeeping_suspend(void); extern int timekeeping_suspend(void);
extern void timekeeping_resume(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 #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment