3.4-stable patches

added patches:
	nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch

diff --git a/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch b/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch
new file mode 100644 (file)
index 0000000..f6acc5f
--- /dev/null
+++ b/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch
@@ -0,0 +1,40 @@
+From 0e576acbc1d9600cf2d9b4a141a2554639959d50 Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 29 Nov 2013 12:18:13 +0100
+Subject: nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off
+
+From: Thomas Gleixner <tglx@linutronix.de>
+
+commit 0e576acbc1d9600cf2d9b4a141a2554639959d50 upstream.
+
+If CONFIG_NO_HZ=n tick_nohz_get_sleep_length() returns NSEC_PER_SEC/HZ.
+
+If CONFIG_NO_HZ=y and the nohz functionality is disabled via the
+command line option "nohz=off" or not enabled due to missing hardware
+support, then tick_nohz_get_sleep_length() returns 0. That happens
+because ts->sleep_length is never set in that case.
+
+Set it to NSEC_PER_SEC/HZ when the NOHZ mode is inactive.
+
+Reported-by: Michal Hocko <mhocko@suse.cz>
+Reported-by: Borislav Petkov <bp@alien8.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Rui Xiang <rui.xiang@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
+index a12df5abde0b..ea20f7d1ac2c 100644
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -711,8 +711,10 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
+               return false;
+       }
+ 
+-      if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))
++      if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) {
++              ts->sleep_length = (ktime_t) { .tv64 = NSEC_PER_SEC/HZ };
+               return false;
++      }
+ 
+       if (need_resched())
+               return false;

diff --git a/queue-3.4/series b/queue-3.4/series
index 93e66380b73478190e55ed82ee67ff463702ca24..4c5a2dfdec145697fb0d41e83c6cd0a7026c6af9 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -14,3 +14,4 @@ usb-cdc-acm-fix-runtime-pm-for-control-messages.patch
 usb-cdc-acm-fix-shutdown-and-suspend-race.patch
 usb-cdc-acm-fix-i-o-after-failed-open.patch
 usb-cdc-acm-fix-runtime-pm-imbalance-at-shutdown.patch
+nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch