OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.9.95' into android-4.9.95
[android-x86/kernel.git]
/
arch
/
arm64
/
lib
/
clear_user.S
diff --git
a/arch/arm64/lib/clear_user.S
b/arch/arm64/lib/clear_user.S
index
efbf610
..
b581e16
100644
(file)
--- a/
arch/arm64/lib/clear_user.S
+++ b/
arch/arm64/lib/clear_user.S
@@
-17,10
+17,7
@@
*/
#include <linux/linkage.h>
*/
#include <linux/linkage.h>
-#include <asm/alternative.h>
-#include <asm/assembler.h>
-#include <asm/cpufeature.h>
-#include <asm/sysreg.h>
+#include <asm/uaccess.h>
.text
.text
@@
-33,8
+30,7
@@
* Alignment fixed up by hardware.
*/
ENTRY(__arch_clear_user)
* Alignment fixed up by hardware.
*/
ENTRY(__arch_clear_user)
-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(0)), ARM64_ALT_PAN_NOT_UAO, \
- CONFIG_ARM64_PAN)
+ uaccess_enable_not_uao x2, x3, x4
mov x2, x1 // save the size for fixup return
subs x1, x1, #8
b.mi 2f
mov x2, x1 // save the size for fixup return
subs x1, x1, #8
b.mi 2f
@@
-54,8
+50,7
@@
uao_user_alternative 9f, strh, sttrh, wzr, x0, 2
b.mi 5f
uao_user_alternative 9f, strb, sttrb, wzr, x0, 0
5: mov x0, #0
b.mi 5f
uao_user_alternative 9f, strb, sttrb, wzr, x0, 0
5: mov x0, #0
-ALTERNATIVE("nop", __stringify(SET_PSTATE_PAN(1)), ARM64_ALT_PAN_NOT_UAO, \
- CONFIG_ARM64_PAN)
+ uaccess_disable_not_uao x2, x3
ret
ENDPROC(__arch_clear_user)
ret
ENDPROC(__arch_clear_user)