diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index eca0f5593a75..a2310d1bebe1 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * | 46 | * |
47 | * returns the time in ktime_t format | 47 | * returns the time in ktime_t format |
48 | */ | 48 | */ |
49 | static ktime_t ktime_get(void) | 49 | ktime_t ktime_get(void) |
50 | { | 50 | { |
51 | struct timespec now; | 51 | struct timespec now; |
52 | 52 | ||
@@ -60,7 +60,7 @@ static ktime_t ktime_get(void) | |||
60 | * | 60 | * |
61 | * returns the time in ktime_t format | 61 | * returns the time in ktime_t format |
62 | */ | 62 | */ |
63 | static ktime_t ktime_get_real(void) | 63 | ktime_t ktime_get_real(void) |
64 | { | 64 | { |
65 | struct timespec now; | 65 | struct timespec now; |
66 | 66 | ||
@@ -311,14 +311,6 @@ static unsigned long ktime_divns(const ktime_t kt, s64 div) | |||
311 | #endif /* BITS_PER_LONG >= 64 */ | 311 | #endif /* BITS_PER_LONG >= 64 */ |
312 | 312 | ||
313 | /* | 313 | /* |
314 | * Timekeeping resumed notification | ||
315 | */ | ||
316 | void hrtimer_notify_resume(void) | ||
317 | { | ||
318 | clock_was_set(); | ||
319 | } | ||
320 | |||
321 | /* | ||
322 | * Counterpart to lock_timer_base above: | 314 | * Counterpart to lock_timer_base above: |
323 | */ | 315 | */ |
324 | static inline | 316 | static inline |
@@ -889,6 +881,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, | |||
889 | 881 | ||
890 | #ifdef CONFIG_HOTPLUG_CPU | 882 | #ifdef CONFIG_HOTPLUG_CPU |
891 | case CPU_DEAD: | 883 | case CPU_DEAD: |
884 | clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &cpu); | ||
892 | migrate_hrtimers(cpu); | 885 | migrate_hrtimers(cpu); |
893 | break; | 886 | break; |
894 | #endif | 887 | #endif |