diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 04:00:02 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 04:00:02 +0100 |
| commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
| tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /arch/arm/lib | |
| parent | ARM: shmobile: alt: add VIN0, ADV7180 DT support (diff) | |
| parent | Linux 4.4-rc1 (diff) | |
| download | linux-998f468f34f41905051556a9897dbc204b1b75b4.tar.xz linux-998f468f34f41905051556a9897dbc204b1b75b4.zip | |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/clear_user.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S index 970d6c043774..e936352ccb00 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S @@ -9,6 +9,7 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> +#include <asm/unwind.h> .text @@ -20,6 +21,8 @@ */ ENTRY(__clear_user_std) WEAK(arm_clear_user) +UNWIND(.fnstart) +UNWIND(.save {r1, lr}) stmfd sp!, {r1, lr} mov r2, #0 cmp r1, #4 @@ -44,6 +47,7 @@ WEAK(arm_clear_user) USER( strnebt r2, [r0]) mov r0, #0 ldmfd sp!, {r1, pc} +UNWIND(.fnend) ENDPROC(arm_clear_user) ENDPROC(__clear_user_std) |