projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
arch
/
arm
/
include
/
asm
/
futex.h
diff --git
a/arch/arm/include/asm/futex.h
b/arch/arm/include/asm/futex.h
index 7be54690aeec0f38be6bb2738a8a7df8a243021d..e42cf597f6e6b5b7bcad58cdf9e75289d66672d4 100644
(file)
--- a/
arch/arm/include/asm/futex.h
+++ b/
arch/arm/include/asm/futex.h
@@
-19,6
+19,7
@@
" .long 1b, 4f, 2b, 4f\n" \
" .popsection\n" \
" .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
"4: mov %0, " err_reg "\n" \
" b 3b\n" \
" .popsection"
This page took
0.026734 seconds
and
5
git commands to generate.