From 61a9c37f5941bd08c7e2b4a9283f0b06005e00da Mon Sep 17 00:00:00 2001 From: Haren Myneni Date: Thu, 6 Dec 2012 21:48:26 +0000 Subject: [PATCH] --- yaml --- r: 356367 b: refs/heads/master c: a09688cd23d477ebd9c8f57881bfe907240cb0a1 h: refs/heads/master i: 356365: 47aeb4fa4c27308d3d2868eeae2b29e2b0549694 356363: 02325c36c105d240d8ccafda16cddff73880ec43 356359: 1f97953786da5718135b875bcba4b6a1f8f594a2 356351: 0d2f364b8505d37b42a748d7b7f8a1712c859fdf v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/exception-64s.h | 1 + trunk/arch/powerpc/include/asm/paca.h | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 247dd817f8f7..efb467d581e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d261386852178ce0bdf836f7c92267f21c8bb3f9 +refs/heads/master: a09688cd23d477ebd9c8f57881bfe907240cb0a1 diff --git a/trunk/arch/powerpc/include/asm/exception-64s.h b/trunk/arch/powerpc/include/asm/exception-64s.h index 49b7faf7bbf2..ed3cdcb50198 100644 --- a/trunk/arch/powerpc/include/asm/exception-64s.h +++ b/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) \ diff --git a/trunk/arch/powerpc/include/asm/paca.h b/trunk/arch/powerpc/include/asm/paca.h index e9e7a6999bb8..c47d687ab01b 100644 --- a/trunk/arch/powerpc/include/asm/paca.h +++ b/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;