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/mips | |
| 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/mips')
| -rw-r--r-- | arch/mips/include/uapi/asm/unistd.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index d6e154a9e6a5..19244e913837 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -1029,17 +1029,15 @@ #define __NR_process_vm_writev (__NR_Linux + 310) #define __NR_kcmp (__NR_Linux + 311) #define __NR_finit_module (__NR_Linux + 312) -#define __NR_sched_setattr (__NR_Linux + 313) -#define __NR_sched_getattr (__NR_Linux + 314) /* * Offset of the last N32 flavoured syscall */ -#define __NR_Linux_syscalls 314 +#define __NR_Linux_syscalls 312 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ #define __NR_N32_Linux 6000 -#define __NR_N32_Linux_syscalls 314 +#define __NR_N32_Linux_syscalls 312 #endif /* _UAPI_ASM_UNISTD_H */ |