diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:07:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:07:14 +0000 |
| commit | 1a76c5b8bd1a01399bf2174a98aa8e44ddd71cd0 (patch) | |
| tree | bf0cfc0345a593a713b310e99efa570c405eadd8 /arch/arm64/include | |
| parent | e80ce3a0c501b016a3894b54c085ba2cb5d2199e (diff) | |
| parent | ca619ba092b197599d9c67282e7f97a5713e541a (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/aosp' into linux-linaro-lsk-v3.14-android
Conflicts:
arch/arm64/kernel/Makefile
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 7 | ||||
| -rw-r--r-- | arch/arm64/include/asm/unistd32.h | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 7fb343779498..aab72ce22348 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -143,7 +143,14 @@ static inline int reinstall_suspended_bps(struct pt_regs *regs) } #endif +#ifdef CONFIG_COMPAT int aarch32_break_handler(struct pt_regs *regs); +#else +static int aarch32_break_handler(struct pt_regs *regs) +{ + return -EFAULT; +} +#endif #endif /* __ASSEMBLY */ #endif /* __KERNEL__ */ diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 76d094565090..35ea6df78b0d 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -781,10 +781,10 @@ __SYSCALL(__NR_process_vm_writev, compat_sys_process_vm_writev) __SYSCALL(__NR_kcmp, sys_kcmp) #define __NR_finit_module 379 __SYSCALL(__NR_finit_module, sys_finit_module) -/* #define __NR_sched_setattr 380 */ -__SYSCALL(380, sys_ni_syscall) -/* #define __NR_sched_getattr 381 */ -__SYSCALL(381, sys_ni_syscall) +#define __NR_sched_setattr 380 +__SYSCALL(__NR_sched_setattr, sys_sched_setattr) +#define __NR_sched_getattr 381 +__SYSCALL(__NR_sched_getattr, sys_sched_getattr) /* #define __NR_renameat2 382 */ __SYSCALL(382, sys_ni_syscall) #define __NR_seccomp 383 |