From patchwork Mon Nov 26 16:59:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [270/270] Revert "sched: Add missing call to calc_load_exit_idle()" Date: Mon, 26 Nov 2012 06:59:20 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 202027 Message-Id: <1353949160-26803-271-git-send-email-herton.krzesinski@canonical.com> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Charles Wang , Peter Zijlstra , Greg Kroah-Hartman , Jonathan Nieder , Huacai Chen , Ingo Molnar 3.5.7u1 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Herton Ronaldo Krzesinski This reverts commit 900404e5d201d0a6d2806f615b41e939713d55db on 3.5, which is commit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream. The change was originally intended to fix a mismerge in 3.6. The 3.5 stable branch was unaffected by the issue, as reported by Huacai Chen on stable mailing list (on the thread 'Seems like "sched: Add missing call to calc_load_exit_idle()" should be reverted in 3.5 branch'). As concluded by Peter Zijlstra: "(...) You are right, v3.5.5 has one calc_load_exit_idle() too many, the one in tick_nohz_update_jiffies() needs to go. (...)" Cc: Huacai Chen Cc: Peter Zijlstra Cc: Jonathan Nieder Cc: Greg Kroah-Hartman Cc: Charles Wang Cc: Ingo Molnar Signed-off-by: Herton Ronaldo Krzesinski --- kernel/time/tick-sched.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index a057ed4..4a08472 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(); }