diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-07 20:53:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-07 20:53:53 +0100 |
| commit | 513149cba8f2b2cadf1e0ecc13d008cb78a455c8 (patch) | |
| tree | 47c2bc3a1a0a1ba3eac7286a74894da76a4b1b5f /arch/arm/kernel/entry-armv.S | |
| parent | 1f13aa4d5194cbbc7934012069c05a60fc697df9 (diff) | |
| parent | 71f8af1110101facfad68989ff91f88f8e2c3e22 (diff) | |
Merge branch 'uaccess' into fixes
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 77f54830554c..55a47df04773 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -27,6 +27,7 @@ #include <asm/unistd.h> #include <asm/tls.h> #include <asm/system_info.h> +#include <asm/uaccess-asm.h> #include "entry-header.S" #include <asm/entry-macro-multi.S> @@ -179,15 +180,7 @@ ENDPROC(__und_invalid) stmia r7, {r2 - r6} get_thread_info tsk - ldr r0, [tsk, #TI_ADDR_LIMIT] - mov r1, #TASK_SIZE - str r1, [tsk, #TI_ADDR_LIMIT] - str r0, [sp, #SVC_ADDR_LIMIT] - - uaccess_save r0 - .if \uaccess - uaccess_disable r0 - .endif + uaccess_entry tsk, r0, r1, r2, \uaccess .if \trace #ifdef CONFIG_TRACE_IRQFLAGS |