diff options
| author | Chris Zankel | 2014-10-23 19:30:33 +0200 |
|---|---|---|
| committer | Chris Zankel | 2014-10-23 19:30:33 +0200 |
| commit | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (patch) | |
| tree | 1db5fa8379e4b8578295e36f07a4885ef23e6e43 /arch/xtensa/include/uapi/asm | |
| parent | Merge tag 'v3.18-rc1' into for_next (diff) | |
| parent | xtensa: xtfpga: add lx200 SMP DTS and defconfig (diff) | |
| download | kernel-qcow2-linux-66acb0216d5ae1f29fe76c5a192547664c5c0159.tar.gz kernel-qcow2-linux-66acb0216d5ae1f29fe76c5a192547664c5c0159.tar.xz kernel-qcow2-linux-66acb0216d5ae1f29fe76c5a192547664c5c0159.zip | |
Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- add seccomp, getrandom, and memfd_create syscalls;
- add defconfigs for KC705 and SMP LX200;
- fix ISS and xtfpga Kconfig dependencies so that more randconfigs
are buildable;
- fix umount syscall;
- implement pgprot_noncached.
Diffstat (limited to 'arch/xtensa/include/uapi/asm')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/unistd.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index 8883fc877c5c..db5bb72e2f4e 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -384,7 +384,8 @@ __SYSCALL(174, sys_chroot, 1) #define __NR_pivot_root 175 __SYSCALL(175, sys_pivot_root, 2) #define __NR_umount 176 -__SYSCALL(176, sys_umount, 2) +__SYSCALL(176, sys_oldumount, 1) +#define __ARCH_WANT_SYS_OLDUMOUNT #define __NR_swapoff 177 __SYSCALL(177, sys_swapoff, 1) #define __NR_sync 178 @@ -742,7 +743,14 @@ __SYSCALL(335, sys_sched_getattr, 3) #define __NR_renameat2 336 __SYSCALL(336, sys_renameat2, 5) -#define __NR_syscall_count 337 +#define __NR_seccomp 337 +__SYSCALL(337, sys_seccomp, 3) +#define __NR_getrandom 338 +__SYSCALL(338, sys_getrandom, 3) +#define __NR_memfd_create 339 +__SYSCALL(339, sys_memfd_create, 2) + +#define __NR_syscall_count 340 /* * sysxtensa syscall handler |