leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tick: Move clocksource related stuff to timekeeping.h

Browse Source 
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>
This commit is contained in:
Thomas Gleixner
2015-03-25 13:06:04 +01:00
committed by Ingo Molnar
parent 9f083b74df
commit bfb83b2751
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/clocksource.c
View File

@@ -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"
/** /**

2
kernel/time/jiffies.c
View File

@@ -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

1
kernel/time/ntp.c
View File

@@ -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
kernel/time/tick-internal.h
View File

@@ -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);
#endif /* GENERIC_CLOCKEVENTS */ #endif /* GENERIC_CLOCKEVENTS */
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);

7
kernel/time/timekeeping.h
View File

@@ -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