summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/processor.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2022-03-21 10:34:57 +0100
committerBorislav Petkov <bp@suse.de>2022-03-21 10:34:57 +0100
commit1422df58e5eb83dca131dc64e0f307a1f9e56078 (patch)
treef54bb7952a406cd783cbdbfe1b5ac4f80de02d68 /arch/arm/include/asm/processor.h
parente1bca853dddcb57cbf084acbf35e3654cef6fc75 (diff)
parent2151c84ece920dc55942495004a823cbecb921e5 (diff)
downloadlinux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.gz
linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.bz2
linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.zip
Merge branch 'edac-amd64' into edac-updates-for-v5.18
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/arm/include/asm/processor.h')
-rw-r--r--arch/arm/include/asm/processor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index 6af68edfa53a..bdc35c0e8dfb 100644
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -96,6 +96,7 @@ unsigned long __get_wchan(struct task_struct *p);
#define __ALT_SMP_ASM(smp, up) \
"9998: " smp "\n" \
" .pushsection \".alt.smp.init\", \"a\"\n" \
+ " .align 2\n" \
" .long 9998b - .\n" \
" " up "\n" \
" .popsection\n"