2020-10-13 03:39:02

by Qian Cai

Subject: [PATCH -next] arm64: Fix redefinition of init_new_context()

The linux-next commit c870baeede75 ("asm-generic: add generic MMU
versions of mmu context functions") missed a case in the arm64/for-next
branch.

Signed-off-by: Qian Cai <[email protected]>
---
arch/arm64/include/asm/mmu_context.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
index da5f146e665b..cd5c33a50469 100644
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@ -176,6 +176,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp)
*/
void check_and_switch_context(struct mm_struct *mm);

+#define init_new_context init_new_context
static inline int
init_new_context(struct task_struct *tsk, struct mm_struct *mm)
{
--
2.28.0

2020-10-13 12:30:40

by Nick Desaulniers

Subject: Re: [PATCH -next] arm64: Fix redefinition of init_new_context()

Our CI went red for -next on arm64 due to c870baeede75. Thanks for sending a
fix.

Tested-by: Nick Desaulniers <[email protected]>

https://lore.kernel.org/linux-next/[email protected]/

2020-10-28 20:01:29

by Qian Cai

Subject: Re: [PATCH -next] arm64: Fix redefinition of init_new_context()

On Mon, 2020-10-12 at 10:10 -0400, Qian Cai wrote:
> The linux-next commit c870baeede75 ("asm-generic: add generic MMU
> versions of mmu context functions") missed a case in the arm64/for-next
> branch.
>
> Signed-off-by: Qian Cai <[email protected]>

Arnd, Stephen, can you apply this patch? Those compiling errors are back again
in next-20201027.

> ---
> arch/arm64/include/asm/mmu_context.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/include/asm/mmu_context.h
> b/arch/arm64/include/asm/mmu_context.h
> index da5f146e665b..cd5c33a50469 100644
> --- a/arch/arm64/include/asm/mmu_context.h
> +++ b/arch/arm64/include/asm/mmu_context.h
> @@ -176,6 +176,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp)
> */
> void check_and_switch_context(struct mm_struct *mm);
>
> +#define init_new_context init_new_context
> static inline int
> init_new_context(struct task_struct *tsk, struct mm_struct *mm)
> {