diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 00:01:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 00:01:05 +0200 |
| commit | f6e6e883730aff2718610d3eba7608fcf73328ed (patch) | |
| tree | ec595db5e2454ac5f505a2ce971e45d674f8d6b3 /arch/arm/lib/clear_user.S | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt (diff) | |
| download | linux-f6e6e883730aff2718610d3eba7608fcf73328ed.tar.xz linux-f6e6e883730aff2718610d3eba7608fcf73328ed.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
[ARM] Update mach-types
[ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
[ARM] 3654/1: add ajeco 1arm sbc support
[ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
[ARM] 3651/1: S3C24XX: Make arch list more detailed
[ARM] 3650/1: S3C2412: Update s3c2410_defconfig
[ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
[ARM] 3612/1: make pci bus optional for ixp4xx platform
[ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
[ARM] Remove save_lr/restore_pc macros
[ARM] Remove partial non-v6 binutils compatibility
[ARM] Remove LOADREGS macro
[ARM] Remove RETINSTR macro
Diffstat (limited to 'arch/arm/lib/clear_user.S')
| -rw-r--r-- | arch/arm/lib/clear_user.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S index 7ff9f831b3f9..ea435ae2e4a5 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S @@ -43,10 +43,10 @@ USER( strnebt r2, [r0], #1) tst r1, #1 @ x1 x0 x1 x0 x1 x0 x1 USER( strnebt r2, [r0], #1) mov r0, #0 - LOADREGS(fd,sp!, {r1, pc}) + ldmfd sp!, {r1, pc} .section .fixup,"ax" .align 0 -9001: LOADREGS(fd,sp!, {r0, pc}) +9001: ldmfd sp!, {r0, pc} .previous |