projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mm
/
alignment.c
diff --git
a/arch/arm/mm/alignment.c
b/arch/arm/mm/alignment.c
index edddd66faac6bb9a1f08e8ca144b3677cb9fac3c..a2ab51fa73e2c1982df809af4750a19b124d227e 100644
(file)
--- a/
arch/arm/mm/alignment.c
+++ b/
arch/arm/mm/alignment.c
@@
-166,15
+166,15
@@
union offset_union {
THUMB( "1: "ins" %1, [%2]\n" ) \
THUMB( " add %2, %2, #1\n" ) \
"2:\n" \
THUMB( "1: "ins" %1, [%2]\n" ) \
THUMB( " add %2, %2, #1\n" ) \
"2:\n" \
- " .
section .fixup,\"ax\"\n"
\
+ " .
pushsection .fixup,\"ax\"\n"
\
" .align 2\n" \
"3: mov %0, #1\n" \
" b 2b\n" \
" .align 2\n" \
"3: mov %0, #1\n" \
" b 2b\n" \
- " .p
revious\n"
\
- " .
section __ex_table,\"a\"\n"
\
+ " .p
opsection\n"
\
+ " .
pushsection __ex_table,\"a\"\n"
\
" .align 3\n" \
" .long 1b, 3b\n" \
" .align 3\n" \
" .long 1b, 3b\n" \
- " .p
revious\n"
\
+ " .p
opsection\n"
\
: "=r" (err), "=&r" (val), "=r" (addr) \
: "0" (err), "2" (addr))
: "=r" (err), "=&r" (val), "=r" (addr) \
: "0" (err), "2" (addr))
@@
-226,16
+226,16
@@
union offset_union {
" mov %1, %1, "NEXT_BYTE"\n" \
"2: "ins" %1, [%2]\n" \
"3:\n" \
" mov %1, %1, "NEXT_BYTE"\n" \
"2: "ins" %1, [%2]\n" \
"3:\n" \
- " .
section .fixup,\"ax\"\n"
\
+ " .
pushsection .fixup,\"ax\"\n"
\
" .align 2\n" \
"4: mov %0, #1\n" \
" b 3b\n" \
" .align 2\n" \
"4: mov %0, #1\n" \
" b 3b\n" \
- " .p
revious\n"
\
- " .
section __ex_table,\"a\"\n"
\
+ " .p
opsection\n"
\
+ " .
pushsection __ex_table,\"a\"\n"
\
" .align 3\n" \
" .long 1b, 4b\n" \
" .long 2b, 4b\n" \
" .align 3\n" \
" .long 1b, 4b\n" \
" .long 2b, 4b\n" \
- " .p
revious\n"
\
+ " .p
opsection\n"
\
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
if (err) \
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
if (err) \
@@
-266,18
+266,18
@@
union offset_union {
" mov %1, %1, "NEXT_BYTE"\n" \
"4: "ins" %1, [%2]\n" \
"5:\n" \
" mov %1, %1, "NEXT_BYTE"\n" \
"4: "ins" %1, [%2]\n" \
"5:\n" \
- " .
section .fixup,\"ax\"\n"
\
+ " .
pushsection .fixup,\"ax\"\n"
\
" .align 2\n" \
"6: mov %0, #1\n" \
" b 5b\n" \
" .align 2\n" \
"6: mov %0, #1\n" \
" b 5b\n" \
- " .p
revious\n"
\
- " .
section __ex_table,\"a\"\n"
\
+ " .p
opsection\n"
\
+ " .
pushsection __ex_table,\"a\"\n"
\
" .align 3\n" \
" .long 1b, 6b\n" \
" .long 2b, 6b\n" \
" .long 3b, 6b\n" \
" .long 4b, 6b\n" \
" .align 3\n" \
" .long 1b, 6b\n" \
" .long 2b, 6b\n" \
" .long 3b, 6b\n" \
" .long 4b, 6b\n" \
- " .p
revious\n"
\
+ " .p
opsection\n"
\
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
if (err) \
: "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \
if (err) \