diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/lib/copy_from_user.S | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
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 | ||