From 1d1a62523cefbae5fe8670a68f467b260efcb501 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 5 Mar 2008 12:37:08 +0100
Subject: [PATCH] --- yaml --- r: 86927 b: refs/heads/master c:
 5ccd0e43bb916872022df974d0f39337797d9277 h: refs/heads/master i:   86925:
 d817753a4ce2b2b4c651abaa8a84ef6ac55658fa   86923:
 49b5398cb0845d09e62498282973fb78091428c8   86919:
 a194023ace44dd9a4cb1610840c73de1af3198ce   86911:
 219931f9fbb679f3c65a176da20aed285727ad3f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/s390/kernel/process.c | 4 ++++
 trunk/arch/s390/kernel/time.c    | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 83bc09434683..34feb9c6149f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9361a492cded45af2c3e7f50dbec9dd6dab49861
+refs/heads/master: 5ccd0e43bb916872022df974d0f39337797d9277
diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c
index 1c59ec161cf8..ce203154d8ce 100644
--- a/trunk/arch/s390/kernel/process.c
+++ b/trunk/arch/s390/kernel/process.c
@@ -152,6 +152,10 @@ static void default_idle(void)
 	local_mcck_disable();
 	if (test_thread_flag(TIF_MCCK_PENDING)) {
 		local_mcck_enable();
+		/* disable monitor call class 0 */
+		__ctl_clear_bit(8, 15);
+		atomic_notifier_call_chain(&idle_chain, S390_CPU_NOT_IDLE,
+					   hcpu);
 		local_irq_enable();
 		s390_handle_mcck();
 		return;
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index 76a5dd1b4ce9..cb232c155360 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -209,8 +209,6 @@ static void stop_hz_timer(void)
  */
 static void start_hz_timer(void)
 {
-	BUG_ON(!in_interrupt());
-
 	if (!cpu_isset(smp_processor_id(), nohz_cpu_mask))
 		return;
 	account_ticks(get_clock());