timer fixes
Ingo Molnar
maintainerLinus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
HEAD: ae920eb24277e4a174a3ca575ce42b98b18a6748 Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Three small fixlets.
Thanks,
Ingo
------------------>
Baruch Siach (1):
sched_clock: Fix integer overflow
Li Zhong (1):
nohz: fix compile warning in tick_nohz_init()
Steven Rostedt (1):
nohz: Do not warn about unstable tsc unless user uses nohz_full
kernel/time/sched_clock.c | 2 +- kernel/time/tick-sched.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
kernel/time/sched_clock.c +1 -1
@@ -121,7 +121,7 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)BUG_ON (bits >32 );WARN_ON (!irqs_disabled ()); read_sched_clock = read; - sched_clock_mask = (1 << bits) -1 ; + sched_clock_mask = (1ULL << bits) -1 ; cd.rate = rate;/* calculate the mult/shift to convert counter ticks to ns. */
kernel/time/tick-sched.c +2 -3
@@ -182,7 +182,8 @@ static bool can_stop_full_tick(void)* Don't allow the user to think they can get * full NO_HZ with this machine. */ -WARN_ONCE (1 ,"NO_HZ FULL will not work with unstable sched clock" ); +WARN_ONCE (have_nohz_full_mask, +"NO_HZ FULL will not work with unstable sched clock" ); return false; }#endif
@@ -343,8 +344,6 @@ static int tick_nohz_init_all(void)void __init tick_nohz_init (void ) { -int cpu; -if (!have_nohz_full_mask) {if (tick_nohz_init_all () <0 )return ;