Commit c33e54fa authored by Michael Ellerman's avatar Michael Ellerman

powerpc: Fix build break due to paca mm_context_t changes

Commit 2fc251a8 ("powerpc: Copy only required pieces of the
mm_context_t to the paca") broke the build for CONFIG_PPC_STD_MMU_64=y
and CONFIG_PPC_MM_SLICES=n.

That only happens for a kernel built with 4K pages and HUGETLB disabled,
which is why we missed it.

Fix it by adding a mm_ctx_user_psize member to the paca and populating
it in the appropriate places.

Fixes: 2fc251a8 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7b8ad495
...@@ -138,6 +138,7 @@ struct paca_struct { ...@@ -138,6 +138,7 @@ struct paca_struct {
u64 mm_ctx_low_slices_psize; u64 mm_ctx_low_slices_psize;
unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE]; unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE];
#else #else
u16 mm_ctx_user_psize;
u16 mm_ctx_sllp; u16 mm_ctx_sllp;
#endif #endif
#endif #endif
...@@ -212,6 +213,7 @@ static inline void copy_mm_to_paca(mm_context_t *context) ...@@ -212,6 +213,7 @@ static inline void copy_mm_to_paca(mm_context_t *context)
memcpy(&get_paca()->mm_ctx_high_slices_psize, memcpy(&get_paca()->mm_ctx_high_slices_psize,
&context->high_slices_psize, SLICE_ARRAY_SIZE); &context->high_slices_psize, SLICE_ARRAY_SIZE);
#else #else
get_paca()->mm_ctx_user_psize = context->user_psize;
get_paca()->mm_ctx_sllp = context->sllp; get_paca()->mm_ctx_sllp = context->sllp;
#endif #endif
} }
......
...@@ -866,7 +866,7 @@ static unsigned int get_paca_psize(unsigned long addr) ...@@ -866,7 +866,7 @@ static unsigned int get_paca_psize(unsigned long addr)
#else #else
unsigned int get_paca_psize(unsigned long addr) unsigned int get_paca_psize(unsigned long addr)
{ {
return get_paca()->context.user_psize; return get_paca()->mm_ctx_user_psize;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment