diff options
authorNick Desaulniers <>2021-10-04 18:03:28 +0100
committerGreg Kroah-Hartman <>2021-11-02 17:38:11 +0100
commitfab287a309ee9ea23445236e721e597258f451ac (patch)
parent7e1cc0d92c7deb0994154b3b6e9eea8e3aa4af0c (diff)
ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
commit e6a0c958bdf9b2e1b57501fc9433a461f0a6aadd upstream. A kernel built with CONFIG_THUMB2_KERNEL=y and using clang as the assembler could generate non-naturally-aligned v7wbi_tlb_fns which results in a boot failure. The original commit adding the macro missed the .align directive on this data. Link: Link: Debugged-by: Ard Biesheuvel <> Debugged-by: Nathan Chancellor <> Debugged-by: Richard Henderson <> Fixes: 66a625a88174 ("ARM: mm: proc-macros: Add generic proc/cache/tlb struct definition macros") Suggested-by: Ard Biesheuvel <> Acked-by: Ard Biesheuvel <> Signed-off-by: Nick Desaulniers <> Tested-by: Nathan Chancellor <> Signed-off-by: Russell King (Oracle) <> Signed-off-by: Greg Kroah-Hartman <>
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 1da55d34f4d6..f1239c52e35d 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -327,6 +327,7 @@ ENTRY(\name\()_cache_fns)
.macro define_tlb_functions name:req, flags_up:req, flags_smp
.type \name\()_tlb_fns, #object
+ .align 2
.long \name\()_flush_user_tlb_range
.long \name\()_flush_kern_tlb_range