---

yaml
---
r: 356367
b: refs/heads/master
c: a09688c
h: refs/heads/master
i:
  356365: 47aeb4f
  356363: 02325c3
  356359: 1f97953
  356351: 0d2f364
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d261386852178ce0bdf836f7c92267f21c8bb3f9
+refs/heads/master: a09688cd23d477ebd9c8f57881bfe907240cb0a1

trunk/arch/powerpc/include/asm/exception-64s.h

@@ -47,6 +47,7 @@
 #define EX_R3		64
 #define EX_LR		72
 #define EX_CFAR		80
+#define EX_PPR		88	/* SMT thread status register (priority) */
 
 #ifdef CONFIG_RELOCATABLE
 #define EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)			\

trunk/arch/powerpc/include/asm/paca.h

@@ -93,9 +93,9 @@ struct paca_struct {
 	 * Now, starting in cacheline 2, the exception save areas
 	 */
 	/* used for most interrupts/exceptions */
-	u64 exgen[11] __attribute__((aligned(0x80)));
-	u64 exmc[11];		/* used for machine checks */
-	u64 exslb[11];		/* used for SLB/segment table misses
+	u64 exgen[12] __attribute__((aligned(0x80)));
+	u64 exmc[12];		/* used for machine checks */
+	u64 exslb[12];		/* used for SLB/segment table misses
  				 * on the linear mapping */
 	/* SLB related definitions */
 	u16 vmalloc_sllp;