---

yaml
---
r: 147979
b: refs/heads/master
c: a6c372d
h: refs/heads/master
i:
  147977: 67bf522
  147975: 98c4ea2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43e352139f51216a8c56b0bd5fc3d4e05c65619
+refs/heads/master: a6c372de6e4b9a8188b66badcee3e3792eccdd26

trunk/drivers/lguest/interrupts_and_traps.c

@@ -511,9 +511,9 @@ static enum hrtimer_restart clockdev_fn(struct hrtimer *timer)
 
 	/* Remember the first interrupt is the timer interrupt. */
 	set_bit(0, cpu->irqs_pending);
-	/* If the Guest is actually stopped, we need to wake it up. */
-	if (cpu->halted)
-		wake_up_process(cpu->tsk);
+	/* Guest may be stopped or running on another CPU. */
+	if (!wake_up_process(cpu->tsk))
+		kick_process(cpu->tsk);
 	return HRTIMER_NORESTART;
 }
 

trunk/drivers/lguest/lguest_user.c

@@ -24,8 +24,8 @@ static int break_guest_out(struct lg_cpu *cpu, const unsigned long __user*input)
 
 	if (on) {
 		cpu->break_out = 1;
-		/* Pop it out of the Guest (may be running on different CPU) */
-		wake_up_process(cpu->tsk);
+		if (!wake_up_process(cpu->tsk))
+			kick_process(cpu->tsk);
 		/* Wait for them to reset it */
 		return wait_event_interruptible(cpu->break_wq, !cpu->break_out);
 	} else {