diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 17:27:05 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 17:29:05 +0200 |
| commit | 5306293c9cd2caf41849cc909281bda628bb989e (patch) | |
| tree | 3be4e8231e2772c8a43ddbef5c6a72c20b3054bb /arch/arm/lib/clear_user.S | |
| parent | nfsd4: use local variable in nfs4svc_encode_compoundres (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-5306293c9cd2caf41849cc909281bda628bb989e.tar.xz linux-5306293c9cd2caf41849cc909281bda628bb989e.zip | |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
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 1279abd8b886..5e3f99620c04 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S @@ -46,8 +46,8 @@ USER( strnebt r2, [r0]) ldmfd sp!, {r1, pc} ENDPROC(__clear_user) - .section .fixup,"ax" + .pushsection .fixup,"ax" .align 0 9001: ldmfd sp!, {r0, pc} - .previous + .popsection |