On Tue, Apr 21, 2020 at 12:20:41PM -0700, Nathan Chancellor wrote: > From: Arnd Bergmann <arnd@xxxxxxxx> > > commit 94a5d8790e79ab78f499d2d9f1ff2cab63849d9f upstream. > > Without including psci.h and arm-smccc.h, we now get a build failure in > some configurations: > > arch/arm64/kernel/cpu_errata.c: In function 'arm64_update_smccc_conduit': > arch/arm64/kernel/cpu_errata.c:278:10: error: 'psci_ops' undeclared (first use in this function); did you mean 'sysfs_ops'? > > arch/arm64/kernel/cpu_errata.c: In function 'arm64_set_ssbd_mitigation': > arch/arm64/kernel/cpu_errata.c:311:3: error: implicit declaration of function 'arm_smccc_1_1_hvc' [-Werror=implicit-function-declaration] > arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_2, state, NULL); > > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> > Signed-off-by: Nathan Chancellor <natechancellor@xxxxxxxxx> > --- > > Greg and Sasha, > > Please apply this to 4.9. The error in the commit message can be > reproduced on 4.9.219 when CONFIG_ARM64_SSBD is enabled and > CONFIG_HARDEN_BRANCH_PREDICTOR is disabled. It was reported to me by a > user of one of my Android stable trees, where one of the configs in > Qualcomm's 4.9 tree reproduced this issue. > > This commit is in 4.14 already so this should be the only tree where it > is needed. Now queued up, thanks. greg k-h
