diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-19 05:15:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-21 03:45:21 -0400 |
commit | 4260415f6a3b92c5c986398d96c314df37a4ccbf (patch) | |
tree | 13db8d997677c70d7b3f880daafab41d0b6711f3 /arch/arm/lib/copy_from_user.S | |
parent | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (diff) |
ARM: fix build error in arch/arm/kernel/process.c
/tmp/ccJ3ssZW.s: Assembler messages:
/tmp/ccJ3ssZW.s:1952: Error: can't resolve `.text' {.text section} - `.LFB1077'
This is caused because:
.section .data
.section .text
.section .text
.previous
does not return us to the .text section, but the .data section; this
makes use of .previous dangerous if the ordering of previous sections
is not known.
Fix up the other users of .previous; .pushsection and .popsection are
a safer pairing to use than .section and .previous.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/copy_from_user.S')
-rw-r--r-- | arch/arm/lib/copy_from_user.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index e4fe124acedc..66a477a3e3cc 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S | |||
@@ -90,7 +90,7 @@ ENTRY(__copy_from_user) | |||
90 | 90 | ||
91 | ENDPROC(__copy_from_user) | 91 | ENDPROC(__copy_from_user) |
92 | 92 | ||
93 | .section .fixup,"ax" | 93 | .pushsection .fixup,"ax" |
94 | .align 0 | 94 | .align 0 |
95 | copy_abort_preamble | 95 | copy_abort_preamble |
96 | ldmfd sp!, {r1, r2} | 96 | ldmfd sp!, {r1, r2} |
@@ -100,5 +100,5 @@ ENDPROC(__copy_from_user) | |||
100 | bl __memzero | 100 | bl __memzero |
101 | ldr r0, [sp], #4 | 101 | ldr r0, [sp], #4 |
102 | copy_abort_end | 102 | copy_abort_end |
103 | .previous | 103 | .popsection |
104 | 104 | ||