Skip to content

Commit e6a0c95

Browse files
nickdesaulniersRussell King (Oracle)
authored andcommitted
ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
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: ClangBuiltLinux#1447 Link: https://lore.kernel.org/all/0699da7b-354f-aecc-a62f-e25693209af4@linaro.org/ Debugged-by: Ard Biesheuvel <ardb@kernel.org> Debugged-by: Nathan Chancellor <nathan@kernel.org> Debugged-by: Richard Henderson <richard.henderson@linaro.org> Fixes: 66a625a ("ARM: mm: proc-macros: Add generic proc/cache/tlb struct definition macros") Suggested-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Tested-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent df909df commit e6a0c95

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/arm/mm/proc-macros.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ ENTRY(\name\()_cache_fns)
340340

341341
.macro define_tlb_functions name:req, flags_up:req, flags_smp
342342
.type \name\()_tlb_fns, #object
343+
.align 2
343344
ENTRY(\name\()_tlb_fns)
344345
.long \name\()_flush_user_tlb_range
345346
.long \name\()_flush_kern_tlb_range

0 commit comments

Comments
 (0)