1 files changed, 7 insertions, 6 deletions

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 04b60af027ae..3892db93b837 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -91,14 +91,14 @@ struct paca_struct {
         u8 cpu_start;                   /* At startup, processor spins until */
                                         /* this becomes non-zero. */
         u8 kexec_state;         /* set when kexec down has irqs off */
-#ifdef CONFIG_PPC_STD_MMU_64
+#ifdef CONFIG_PPC_BOOK3S_64
         struct slb_shadow *slb_shadow_ptr;
         struct dtl_entry *dispatch_log;
         struct dtl_entry *dispatch_log_end;
-#endif /* CONFIG_PPC_STD_MMU_64 */
+#endif
         u64 dscr_default;               /* per-CPU default DSCR */
 
-#ifdef CONFIG_PPC_STD_MMU_64
+#ifdef CONFIG_PPC_BOOK3S_64
         /*
          * Now, starting in cacheline 2, the exception save areas
          */
@@ -110,7 +110,7 @@ struct paca_struct {
         u16 vmalloc_sllp;
         u16 slb_cache_ptr;
         u32 slb_cache[SLB_CACHE_ENTRIES];
-#endif /* CONFIG_PPC_STD_MMU_64 */
+#endif /* CONFIG_PPC_BOOK3S_64 */
 
 #ifdef CONFIG_PPC_BOOK3E
         u64 exgen[8] __aligned(0x40);
@@ -143,7 +143,7 @@ struct paca_struct {
 #ifdef CONFIG_PPC_MM_SLICES
         u64 mm_ctx_low_slices_psize;
         unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE];
-        unsigned long addr_limit;
+        unsigned long mm_ctx_slb_addr_limit;
 #else
         u16 mm_ctx_user_psize;
         u16 mm_ctx_sllp;
@@ -192,7 +192,7 @@ struct paca_struct {
         struct stop_sprs stop_sprs;
 #endif
 
-#ifdef CONFIG_PPC_STD_MMU_64
+#ifdef CONFIG_PPC_BOOK3S_64
         /* Non-maskable exceptions that are not performance critical */
         u64 exnmi[EX_SIZE];     /* used for system reset (nmi) */
         u64 exmc[EX_SIZE];      /* used for machine checks */
@@ -210,6 +210,7 @@ struct paca_struct {
          */
         u16 in_mce;
         u8 hmi_event_available;         /* HMI event is available */
+        u8 hmi_p9_special_emu;          /* HMI P9 special emulation */
 #endif
 
         /* Stuff for accurate time accounting */