projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index ceacc6626572a7c2e2c345ba136bd456a267ba64..ef3fa6906e8f1c33abb92cf056cc0ca5aef40a62 100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-812,7
+812,7
@@
static inline void __run_timers(struct tvec_base *base)
spin_unlock_irq(&base->lock);
}
spin_unlock_irq(&base->lock);
}
-#if
defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ)
+#if
def CONFIG_NO_HZ
/*
* Find out when the next timer event is due to happen. This
* is used on S/390 to stop all activity when a cpus is idle.
/*
* Find out when the next timer event is due to happen. This
* is used on S/390 to stop all activity when a cpus is idle.
@@
-947,14
+947,6
@@
unsigned long get_next_timer_interrupt(unsigned long now)
return cmp_next_hrtimer_event(now, expires);
}
return cmp_next_hrtimer_event(now, expires);
}
-
-#ifdef CONFIG_NO_IDLE_HZ
-unsigned long next_timer_interrupt(void)
-{
- return get_next_timer_interrupt(jiffies);
-}
-#endif
-
#endif
#ifndef CONFIG_VIRT_CPU_ACCOUNTING
#endif
#ifndef CONFIG_VIRT_CPU_ACCOUNTING