diff options
| author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2016-04-18 11:28:37 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-04-20 13:22:42 +0200 |
| commit | 643d703d2d2dbf8e2f16efa0a6a32b1eca101d02 (patch) | |
| tree | 5dc230cc9dc4d09fd679570c2090bec3c952b97a /arch/arm64/kernel/sys.c | |
| parent | arm64: cpufeature: Track 32bit EL0 support (diff) | |
| download | linux-643d703d2d2dbf8e2f16efa0a6a32b1eca101d02.tar.xz linux-643d703d2d2dbf8e2f16efa0a6a32b1eca101d02.zip | |
arm64: compat: Check for AArch32 state
Make sure we have AArch32 state available for running COMPAT
binaries and also for switching the personality to PER_LINUX32.
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
[ Added cap bit, checks for HWCAP, personality ]
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Tested-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/sys.c')
| -rw-r--r-- | arch/arm64/kernel/sys.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 75151aaf1a52..26fe8ea93ea2 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -25,6 +25,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/syscalls.h> +#include <asm/cpufeature.h> asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -36,11 +37,20 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, return sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); } +SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) +{ + if (personality(personality) == PER_LINUX32 && + !system_supports_32bit_el0()) + return -EINVAL; + return sys_personality(personality); +} + /* * Wrappers to pass the pt_regs argument. */ asmlinkage long sys_rt_sigreturn_wrapper(void); #define sys_rt_sigreturn sys_rt_sigreturn_wrapper +#define sys_personality sys_arm64_personality #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, |