diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:21 +0800 |
| commit | ba0cfa06c512552bdba8264b46b006478253f39b (patch) | |
| tree | 803ecd2eddc27a45fe41691a2ac058f59051fe9d /arch | |
| parent | 26c815656d14b133b04936f384f5a55fceb2e835 (diff) | |
| parent | aedb4a24b9ae4fbd6ced45ae64ae3d84b423f5c2 (diff) | |
| download | linux-linaro-stable-ba0cfa06c512552bdba8264b46b006478253f39b.tar.gz | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/getuser.S | 2 | ||||
| -rw-r--r-- | arch/arm64/mm/fault.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 8ecfd15c3a02..df73914e81c8 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -67,7 +67,7 @@ ENTRY(__get_user_4) ENDPROC(__get_user_4) ENTRY(__get_user_8) - check_uaccess r0, 8, r1, r2, __get_user_bad + check_uaccess r0, 8, r1, r2, __get_user_bad8 #ifdef CONFIG_THUMB2_KERNEL 5: TUSER(ldr) r2, [r0] 6: TUSER(ldr) r3, [r0, #4] diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 02c121b2acc4..454d76f6a612 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -686,5 +686,6 @@ int cpu_enable_pan(void *__unused) int cpu_enable_uao(void *__unused) { asm(SET_PSTATE_UAO(1)); + return 0; } #endif /* CONFIG_ARM64_UAO */ |