shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

ODROID: Fix compile error.

Browse Source 
This commit occur compile errors.
"arm64: Mitigate spectre style branch history side channels"

Change-Id: I4b39dc25b4974827f347fa3633ad4343d5f5dd2c
This commit is contained in:
Chris
2023-06-13 12:38:49 +09:00
parent 4c0aced572
commit bbd75db978
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/include/asm/assembler.h
View File

@@ -512,7 +512,9 @@ alternative_endif
.macro __mitigate_spectre_bhb_loop tmp
#ifdef CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
alternative_cb spectre_bhb_patch_loop_iter
#endif
mov \tmp, #32 // Patched to correct the immediate
alternative_cb_end
.Lspectre_bhb_loop\@:

2
arch/arm64/kernel/cpu_errata.c
View File

@@ -562,7 +562,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
.capability = ARM64_SPECTRE_BHB,
.matches = is_spectre_bhb_affected,
#ifdef CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
.cpu_enable = spectre_bhb_enable_mitigation,
#endif
#endif
},
{