diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 18:34:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 18:34:13 -0700 |
commit | d7b6de14a0ef8a376f9d57b867545b47302b7bfb (patch) | |
tree | 46904d68a5a68f22e6c6baf3472edd4c37a39481 /kernel/time | |
parent | 30d38542ec777468bb6a31829076a2dbc5690e35 (diff) | |
parent | 4dca10a96041f78bed11ce9e4a5cfde813ec4ccb (diff) | |
download | linux-d7b6de14a0ef8a376f9d57b867545b47302b7bfb.tar.gz linux-d7b6de14a0ef8a376f9d57b867545b47302b7bfb.tar.bz2 linux-d7b6de14a0ef8a376f9d57b867545b47302b7bfb.zip |
Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: fix invalid proc_handler for softlockup_panic
softlockup: fix watchdog task wakeup frequency
softlockup: fix watchdog task wakeup frequency
softlockup: show irqtrace
softlockup: print a module list on being stuck
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
softlockup: fix softlockup_thresh fix
softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
softlockup: allow panic on lockup
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/tick-sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index beef7ccdf842..942fc7c85283 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -140,8 +140,6 @@ void tick_nohz_update_jiffies(void) if (!ts->tick_stopped) return; - touch_softlockup_watchdog(); - cpu_clear(cpu, nohz_cpu_mask); now = ktime_get(); ts->idle_waketime = now; @@ -149,6 +147,8 @@ void tick_nohz_update_jiffies(void) local_irq_save(flags); tick_do_update_jiffies64(now); local_irq_restore(flags); + + touch_softlockup_watchdog(); } void tick_nohz_stop_idle(int cpu) |