timer fixes for 3.10
Linus,
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
* Trivial fixes: Unused variable removal
* Posix-timers: Add the clock ID to the new proc interface to make it useful. The interface is new and should be functional when we reach the final 3.10 release.
* Cure a false positive warning in the tick code introduced by the overhaul in 3.10
* Fix for a persistant clock detection regression introduced in this cycle
Thanks,
tglx
------------------>
Geert Uytterhoeven (1):
ntp: Remove unused variable flags in __hardpps
Pavel Tikhomirov (1):
posix-timers: Show clock ID in proc file
Thomas Gleixner (1):
tick: Cure broadcast false positive pending bit warning
Zoran Markovic (1):
timekeeping: Correct run-time detection of persistent_clock.
fs/proc/base.c | 1 + kernel/time/ntp.c | 1 - kernel/time/tick-broadcast.c | 8 +++++++- kernel/time/timekeeping.c | 8 ++++++++ 4 files changed, 16 insertions(+), 2 deletions(-)
fs/proc/base.c +1 -0
@@ -2118,6 +2118,7 @@ static int show_timer(struct seq_file *m, void *v) nstr[notify & ~SIGEV_THREAD_ID ], (notify &SIGEV_THREAD_ID ) ?"tid" :"pid" , pid_nr_ns(timer->it_pid, tp->ns)); +seq_printf (m,"ClockID: %d\n" , timer->it_clock);return 0 ; }
kernel/time/ntp.c +0 -1
@@ -874,7 +874,6 @@ static void hardpps_update_phase(long error)void __hardpps (const struct timespec *phase_ts,const struct timespec *raw_ts) {struct pps_normtime pts_norm, freq_norm; -unsigned long flags; pts_norm =pps_normalize_ts (*phase_ts);
kernel/time/tick-broadcast.c +7 -1
@@ -511,6 +511,12 @@ again: } } +/* +* Remove the current cpu from the pending mask. The event is +* delivered immediately in tick_do_broadcast() ! +*/ +cpumask_clear_cpu (smp_processor_id (), tick_broadcast_pending_mask); +/* Take care of enforced broadcast requests */ cpumask_or (tmpmask, tmpmask, tick_broadcast_force_mask);cpumask_clear (tick_broadcast_force_mask);
@@ -575,8 +581,8 @@ void tick_broadcast_oneshot_control(unsigned long reason)raw_spin_lock_irqsave (&tick_broadcast_lock, flags);if (reason ==CLOCK_EVT_NOTIFY_BROADCAST_ENTER ) { -WARN_ON_ONCE (cpumask_test_cpu (cpu, tick_broadcast_pending_mask));if (!cpumask_test_and_set_cpu (cpu, tick_broadcast_oneshot_mask)) { +WARN_ON_ONCE (cpumask_test_cpu (cpu, tick_broadcast_pending_mask));clockevents_set_mode (dev,CLOCK_EVT_MODE_SHUTDOWN );/* * We only reprogram the broadcast timer if we
kernel/time/timekeeping.c +8 -0
@@ -975,6 +975,14 @@ static int timekeeping_suspend(void)read_persistent_clock (&timekeeping_suspend_time); +/* +* On some systems the persistent_clock can not be detected at +* timekeeping_init by its return value, so if we see a valid +* value returned, update the persistent_clock_exists flag. +*/ +if (timekeeping_suspend_time.tv_sec || timekeeping_suspend_time.tv_nsec) + persistent_clock_exist = true; +raw_spin_lock_irqsave (&timekeeper_lock, flags);write_seqcount_begin (&timekeeper_seq);timekeeping_forward_now (tk);