diff options
Diffstat (limited to 'kernel/time')
-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 @@ | |||
31 | #include <linux/tick.h> | 31 | #include <linux/tick.h> |
32 | #include <linux/kthread.h> | 32 | #include <linux/kthread.h> |
33 | 33 | ||
34 | #include "tick-internal.h" | 34 | #include "timekeeping.h" |
35 | #include "timekeeping_internal.h" | 35 | #include "timekeeping_internal.h" |
36 | 36 | ||
37 | /** | 37 | /** |
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 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | 27 | ||
28 | #include "tick-internal.h" | 28 | #include "timekeeping.h" |
29 | 29 | ||
30 | /* The Jiffies based clocksource is the lowest common | 30 | /* The Jiffies based clocksource is the lowest common |
31 | * denominator clock source which should function on | 31 | * 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 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
19 | 19 | ||
20 | #include "tick-internal.h" | ||
21 | #include "ntp_internal.h" | 20 | #include "ntp_internal.h" |
22 | 21 | ||
23 | /* | 22 | /* |
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 @@ | |||
6 | 6 | ||
7 | #include "timekeeping.h" | 7 | #include "timekeeping.h" |
8 | 8 | ||
9 | extern seqlock_t jiffies_lock; | ||
10 | |||
11 | #define CS_NAME_LEN 32 | ||
12 | |||
13 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | 9 | #ifdef CONFIG_GENERIC_CLOCKEVENTS |
14 | 10 | ||
15 | #define TICK_DO_TIMER_NONE -1 | 11 | #define TICK_DO_TIMER_NONE -1 |
@@ -169,5 +165,3 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); | |||
169 | 165 | ||
170 | #endif /* GENERIC_CLOCKEVENTS */ | 166 | #endif /* GENERIC_CLOCKEVENTS */ |
171 | 167 | ||
172 | extern void do_timer(unsigned long ticks); | ||
173 | 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); | |||
19 | extern int timekeeping_suspend(void); | 19 | extern int timekeeping_suspend(void); |
20 | extern void timekeeping_resume(void); | 20 | extern void timekeeping_resume(void); |
21 | 21 | ||
22 | extern void do_timer(unsigned long ticks); | ||
23 | extern void update_wall_time(void); | ||
24 | |||
25 | extern seqlock_t jiffies_lock; | ||
26 | |||
27 | #define CS_NAME_LEN 32 | ||
28 | |||
22 | #endif | 29 | #endif |