OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12a0ef7
)
arm64: futex: ensure .fixup entries are sufficiently aligned
author
Will Deacon
<will.deacon@arm.com>
Wed, 6 Nov 2013 19:31:24 +0000
(19:31 +0000)
committer
Catalin Marinas
<catalin.marinas@arm.com>
Thu, 19 Dec 2013 17:43:07 +0000
(17:43 +0000)
AArch64 instructions must be 4-byte aligned, so make sure this is true
for the futex .fixup section.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/futex.h
patch
|
blob
|
history
diff --git
a/arch/arm64/include/asm/futex.h
b/arch/arm64/include/asm/futex.h
index
c582fa3
..
78cc3ab
100644
(file)
--- a/
arch/arm64/include/asm/futex.h
+++ b/
arch/arm64/include/asm/futex.h
@@
-30,6
+30,7
@@
" cbnz %w3, 1b\n" \
"3:\n" \
" .pushsection .fixup,\"ax\"\n" \
+" .align 2\n" \
"4: mov %w0, %w5\n" \
" b 3b\n" \
" .popsection\n" \