delete another patch that was breaking 3.0 builds:

queue-3.0/sched-add-missing-call-to-calc_load_exit_idle.patch

diff --git a/queue-3.0/sched-add-missing-call-to-calc_load_exit_idle.patch b/queue-3.0/sched-add-missing-call-to-calc_load_exit_idle.patch
deleted file mode 100644 (file)
index 3864c98..0000000
--- a/queue-3.0/sched-add-missing-call-to-calc_load_exit_idle.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 749c8814f08f12baa4a9c2812a7c6ede7d69507d Mon Sep 17 00:00:00 2001
-From: Charles Wang <muming.wq@taobao.com>
-Date: Mon, 20 Aug 2012 16:02:33 +0800
-Subject: sched: Add missing call to calc_load_exit_idle()
-
-From: Charles Wang <muming.wq@taobao.com>
-
-commit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream.
-
-Azat Khuzhin reported high loadavg in Linux v3.6
-
-After checking the upstream scheduler code, I found Peter's commit:
-
-  5167e8d5417b sched/nohz: Rewrite and fix load-avg computation -- again
-
-not fully applied, missing the call to calc_load_exit_idle().
-
-After that idle exit in sampling window will always be calculated
-to non-idle, and the load will be higher than normal.
-
-This patch adds the missing call to calc_load_exit_idle().
-
-Signed-off-by: Charles Wang <muming.wq@taobao.com>
-Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Link: http://lkml.kernel.org/r/1345449754-27130-1-git-send-email-muming.wq@gmail.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/time/tick-sched.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/kernel/time/tick-sched.c
-+++ b/kernel/time/tick-sched.c
-@@ -540,6 +540,7 @@ void tick_nohz_restart_sched_tick(void)
-               account_idle_ticks(ticks);
- #endif
- 
-+      calc_load_exit_idle();
-       touch_softlockup_watchdog();
-       /*
-        * Cancel the scheduled timer and restore the tick

diff --git a/queue-3.0/series b/queue-3.0/series
index 67358200efd2cd3f21274063f05e313275312493..82f4b8f73556f68323d263110296846223811d21 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -45,7 +45,6 @@ md-don-t-truncate-size-at-4tb-for-raid0-and-linear.patch
 mm-page_alloc-fix-the-page-address-of-higher-page-s-buddy-calculation.patch
 drivers-rtc-rtc-twl.c-ensure-all-interrupts-are-disabled-during-probe.patch
 hwmon-twl4030-madc-hwmon-initialize-uninitialized-structure-elements.patch
-sched-add-missing-call-to-calc_load_exit_idle.patch
 can-mcp251x-avoid-repeated-frame-bug.patch
 mm-ia64-fix-a-memory-block-size-bug.patch
 memory-hotplug-fix-section-info-double-registration-bug.patch