On Thu, Jul 30, 2020 at 10:59:09AM +0100, Marc Zyngier wrote: > From 33d819f4efa0a4474b5dc2e4bcaef1b886ca30c3 Mon Sep 17 00:00:00 2001 > From: Marc Zyngier <maz@xxxxxxxxxx> > Date: Thu, 30 Jul 2020 10:53:05 +0100 > Subject: [PATCH] arm64: Drop unnecessary include from asm/smp.h > > asm/pointer_auth.h is not needed anymore in asm/smp.h, as 62a679cb2825 > ("arm64: simplify ptrauth initialization") removed the keys from the > secondary_data structure. > > This also cures a compilation issue introduced by f227e3ec3b5c > ("random32: update the net random state on interrupt and activity"). > > Fixes: 62a679cb2825 ("arm64: simplify ptrauth initialization") > Fixes: f227e3ec3b5c ("random32: update the net random state on interrupt and > activity") > Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> > --- > arch/arm64/include/asm/smp.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h > index ea268d88b6f7..a0c8a0b65259 100644 > --- a/arch/arm64/include/asm/smp.h > +++ b/arch/arm64/include/asm/smp.h > @@ -30,7 +30,6 @@ > #include <linux/threads.h> > #include <linux/cpumask.h> > #include <linux/thread_info.h> > -#include <asm/pointer_auth.h> > > DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); I think this arm64 patch makes sense irrespective of any other generic fixes. If Will wants to take it as a fix: Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx> (otherwise I'll queue it for 5.9)