summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-11 14:04:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-13 11:03:41 -0700
commit6d96e9394365dfddf5d418d8178ce2a503448c29 (patch)
tree356dfe3055d85c2198b9351f5c8d3d410000a3ed
parent36c982c1c71b5bb35d06d46ffb82593bf8dbe8c7 (diff)
downloadlinux-3.10-6d96e9394365dfddf5d418d8178ce2a503448c29.tar.gz
linux-3.10-6d96e9394365dfddf5d418d8178ce2a503448c29.tar.bz2
linux-3.10-6d96e9394365dfddf5d418d8178ce2a503448c29.zip
Revert "sched: Add missing call to calc_load_exit_idle()"
This reverts commit 48f0f14ffb6ff4852922994d11fbda418d40100e which was commit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream. It seems to be misapplied, and not needed for 3.4-stable Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Charles Wang <muming.wq@taobao.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/time/tick-sched.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 6570548d088..a1e079536a7 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -145,7 +145,6 @@ static void tick_nohz_update_jiffies(ktime_t now)
tick_do_update_jiffies64(now);
local_irq_restore(flags);
- calc_load_exit_idle();
touch_softlockup_watchdog();
}