---

yaml --- r: 349327 b: refs/heads/master c: 689dfa8 h: refs/heads/master i: 349325: f2ed67f 349323: 2f09cfd 349319: df82305 349311: 713b235 v: v3
git-mirror · Jan 28, 2013 · 9efc898 · 9efc898
1 parent 03523cd
commit 9efc898
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fefd9e6f8860249b2c284d89cb2e51fa71a9503a
+refs/heads/master: 689dfa894c57842a05bf6dc9f97e6bb71ec5f386
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
@@ -494,10 +494,15 @@ void timer_interrupt(struct pt_regs * regs)
 	set_dec(DECREMENTER_MAX);
 
 	/* Some implementations of hotplug will get timer interrupts while
-	 * offline, just ignore these
+	 * offline, just ignore these and we also need to set
+	 * decrementers_next_tb as MAX to make sure __check_irq_replay
+	 * don't replay timer interrupt when return, otherwise we'll trap
+	 * here infinitely :(
 	 */
-	if (!cpu_online(smp_processor_id()))
+	if (!cpu_online(smp_processor_id())) {
+		*next_tb = ~(u64)0;
 		return;
+	}
 
 	/* Conditionally hard-enable interrupts now that the DEC has been
 	 * bumped to its maximum value