1 files changed, 28 insertions, 1 deletions

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 70bd4381f8e6..546540b91095 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -16,6 +16,7 @@
 
 #ifdef CONFIG_PPC64
 
+#include <linux/string.h>
 #include <asm/types.h>
 #include <asm/lppaca.h>
 #include <asm/mmu.h>
@@ -131,7 +132,16 @@ struct paca_struct {
         struct tlb_core_data tcd;
 #endif /* CONFIG_PPC_BOOK3E */
 
-        mm_context_t context;
+#ifdef CONFIG_PPC_BOOK3S
+        mm_context_id_t mm_ctx_id;
+#ifdef CONFIG_PPC_MM_SLICES
+        u64 mm_ctx_low_slices_psize;
+        unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE];
+#else
+        u16 mm_ctx_user_psize;
+        u16 mm_ctx_sllp;
+#endif
+#endif
 
         /*
          * then miscellaneous read-write fields
@@ -194,6 +204,23 @@ struct paca_struct {
 #endif
 };
 
+#ifdef CONFIG_PPC_BOOK3S
+static inline void copy_mm_to_paca(mm_context_t *context)
+{
+        get_paca()->mm_ctx_id = context->id;
+#ifdef CONFIG_PPC_MM_SLICES
+        get_paca()->mm_ctx_low_slices_psize = context->low_slices_psize;
+        memcpy(&get_paca()->mm_ctx_high_slices_psize,
+               &context->high_slices_psize, SLICE_ARRAY_SIZE);
+#else
+        get_paca()->mm_ctx_user_psize = context->user_psize;
+        get_paca()->mm_ctx_sllp = context->sllp;
+#endif
+}
+#else
+static inline void copy_mm_to_paca(mm_context_t *context){}
+#endif
+
 extern struct paca_struct *paca;
 extern void initialise_paca(struct paca_struct *new_paca, int cpu);
 extern void setup_paca(struct paca_struct *new_paca);