diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:17:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:17:35 -0700 |
| commit | 6bec11921a7d7b11d0b1909596636632aece5a26 (patch) | |
| tree | 1bf2ac7d5c482afb2c5cf59c0fc7db7c7ac03ff6 /arch/arm/lib/strnlen_user.S | |
| parent | 553cbf0a8f19c669bed82028988aa977558ef551 (diff) | |
| parent | db7e1bc479cc941c53839b18ff811c7def0c52e7 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
ARM: 6030/1: KS8695: enable console
ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
ARM: fix build error in arch/arm/kernel/process.c
Diffstat (limited to 'arch/arm/lib/strnlen_user.S')
| -rw-r--r-- | arch/arm/lib/strnlen_user.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S index 7855b2906659..0ecbb459c4f1 100644 --- a/arch/arm/lib/strnlen_user.S +++ b/arch/arm/lib/strnlen_user.S @@ -33,8 +33,8 @@ ENTRY(__strnlen_user) mov pc, lr ENDPROC(__strnlen_user) - .section .fixup,"ax" + .pushsection .fixup,"ax" .align 0 9001: mov r0, #0 mov pc, lr - .previous + .popsection |