aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/xen/hypercall.S
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-01-19 22:49:17 +0800
committerAlex Shi <alex.shi@linaro.org>2017-01-19 22:49:17 +0800
commitd661f15677f5205c1d272c2db90b60b2d56b25dd (patch)
treede3654c1be908381cbe1e46d8ff1afd447851330 /arch/arm64/xen/hypercall.S
parent659a75a439d055cc48086afc2e101ca6ad8343a4 (diff)
parent65117109f6344fa46542f85844bc292842116192 (diff)
Merge branch 'lsk-v4.1-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.02-android
Diffstat (limited to 'arch/arm64/xen/hypercall.S')
-rw-r--r--arch/arm64/xen/hypercall.S19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
index 6d6e4af1a4bf..8bbe9401f4f0 100644
--- a/arch/arm64/xen/hypercall.S
+++ b/arch/arm64/xen/hypercall.S
@@ -49,7 +49,6 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <asm/uaccess.h>
#include <xen/interface/xen.h>
@@ -90,24 +89,6 @@ ENTRY(privcmd_call)
mov x2, x3
mov x3, x4
mov x4, x5
-#ifdef CONFIG_ARM64_SW_TTBR0_PAN
- /*
- * Privcmd calls are issued by the userspace. The kernel needs to
- * enable access to TTBR0_EL1 as the hypervisor would issue stage 1
- * translations to user memory via AT instructions. Since AT
- * instructions are not affected by the PAN bit (ARMv8.1), we only
- * need the explicit uaccess_enable/disable if the TTBR0 PAN emulation
- * is enabled (it implies that hardware UAO and PAN disabled).
- */
- uaccess_enable_not_uao x6, x7
-#endif
hvc XEN_IMM
-
-#ifdef CONFIG_ARM64_SW_TTBR0_PAN
- /*
- * Disable userspace access from kernel once the hyp call completed.
- */
- uaccess_disable_not_uao x6
-#endif
ret
ENDPROC(privcmd_call);