Commit e6a0c958 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Russell King (Oracle)

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: https://github.com/ClangBuiltLinux/linux/issues/1447
Link: https://lore.kernel.org/all/0699da7b-354f-aecc-a62f-e25693209af4@linaro.org/Debugged-by: default avatarArd Biesheuvel <ardb@kernel.org>
Debugged-by: default avatarNathan Chancellor <nathan@kernel.org>
Debugged-by: default avatarRichard Henderson <richard.henderson@linaro.org>

Fixes: 66a625a8 ("ARM: mm: proc-macros: Add generic proc/cache/tlb struct definition macros")
Suggested-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent df909df0
...@@ -340,6 +340,7 @@ ENTRY(\name\()_cache_fns) ...@@ -340,6 +340,7 @@ ENTRY(\name\()_cache_fns)
.macro define_tlb_functions name:req, flags_up:req, flags_smp .macro define_tlb_functions name:req, flags_up:req, flags_smp
.type \name\()_tlb_fns, #object .type \name\()_tlb_fns, #object
.align 2
ENTRY(\name\()_tlb_fns) ENTRY(\name\()_tlb_fns)
.long \name\()_flush_user_tlb_range .long \name\()_flush_user_tlb_range
.long \name\()_flush_kern_tlb_range .long \name\()_flush_kern_tlb_range
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment