---

yaml
---
r: 87523
b: refs/heads/master
c: 44387e9
h: refs/heads/master
i:
  87521: 4f89ee8
  87519: 22dcdb3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2372eb9bcafdd149b26987a8c25bbed92fd2775
+refs/heads/master: 44387e9ff25267c78a99229aca55ed750e9174c7

trunk/arch/powerpc/kernel/process.c

@@ -353,6 +353,12 @@ struct task_struct *__switch_to(struct task_struct *prev,
 	account_process_vtime(current);
 	calculate_steal_time();
 
+	/*
+	 * We can't take a PMU exception inside _switch() since there is a
+	 * window where the kernel stack SLB and the kernel stack are out
+	 * of sync. Hard disable here.
+	 */
+	hard_irq_disable();
 	last = _switch(old_thread, new_thread);
 
 	local_irq_restore(flags);

trunk/arch/powerpc/mm/slb.c

@@ -124,6 +124,12 @@ void slb_flush_and_rebolt(void)
 		ksp_vsid_data = get_slb_shadow()->save_area[2].vsid;
 	}
 
+	/*
+	 * We can't take a PMU exception in the following code, so hard
+	 * disable interrupts.
+	 */
+	hard_irq_disable();
+
 	/* We need to do this all in asm, so we're sure we don't touch
 	 * the stack between the slbia and rebolting it. */
 	asm volatile("isync\n"