---

yaml --- r: 86927 b: refs/heads/master c: 5ccd0e4 h: refs/heads/master i: 86925: d817753 86923: 49b5398 86919: a194023 86911: 219931f v: v3
git-mirror · Mar 5, 2008 · 1d1a625 · 1d1a625
1 parent 7589ef5
commit 1d1a625
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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());