* [PATCH 4.9] arm64: cpu_errata: include required headers
@ 2020-04-21 19:20 Nathan Chancellor
2020-04-21 19:34 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Nathan Chancellor @ 2020-04-21 19:20 UTC (permalink / raw
To: Greg Kroah-Hartman, Sasha Levin
Cc: stable, Arnd Bergmann, Catalin Marinas, Nathan Chancellor
From: Arnd Bergmann <arnd@arndb.de>
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@arndb.de>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
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.
arch/arm64/kernel/cpu_errata.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 930e74d9fcbd..3b680a32886b 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <linux/arm-smccc.h>
+#include <linux/psci.h>
#include <linux/types.h>
#include <asm/cachetype.h>
#include <asm/cpu.h>
base-commit: 5188957a315f664d46ff58fedecbc0f7503f1b22
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.9] arm64: cpu_errata: include required headers
2020-04-21 19:20 [PATCH 4.9] arm64: cpu_errata: include required headers Nathan Chancellor
@ 2020-04-21 19:34 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2020-04-21 19:34 UTC (permalink / raw
To: Nathan Chancellor; +Cc: Sasha Levin, stable, Arnd Bergmann, Catalin Marinas
On Tue, Apr 21, 2020 at 12:20:41PM -0700, Nathan Chancellor wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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@arndb.de>
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-21 19:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-21 19:20 [PATCH 4.9] arm64: cpu_errata: include required headers Nathan Chancellor
2020-04-21 19:34 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.