aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include/uapi
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2014-10-23 13:30:33 -0400
committerChris Zankel <chris@zankel.net>2014-10-23 13:30:33 -0400
commit66acb0216d5ae1f29fe76c5a192547664c5c0159 (patch)
tree1db5fa8379e4b8578295e36f07a4885ef23e6e43 /arch/xtensa/include/uapi
parenta13926db3e5ea5bbac297f59e9f35061f52892d3 (diff)
parent3ce2ce1c0d79477c8e093e675f38451105798def (diff)
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')
-rw-r--r--arch/xtensa/include/uapi/asm/unistd.h12
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)
384#define __NR_pivot_root 175 384#define __NR_pivot_root 175
385__SYSCALL(175, sys_pivot_root, 2) 385__SYSCALL(175, sys_pivot_root, 2)
386#define __NR_umount 176 386#define __NR_umount 176
387__SYSCALL(176, sys_umount, 2) 387__SYSCALL(176, sys_oldumount, 1)
388#define __ARCH_WANT_SYS_OLDUMOUNT
388#define __NR_swapoff 177 389#define __NR_swapoff 177
389__SYSCALL(177, sys_swapoff, 1) 390__SYSCALL(177, sys_swapoff, 1)
390#define __NR_sync 178 391#define __NR_sync 178
@@ -742,7 +743,14 @@ __SYSCALL(335, sys_sched_getattr, 3)
742#define __NR_renameat2 336 743#define __NR_renameat2 336
743__SYSCALL(336, sys_renameat2, 5) 744__SYSCALL(336, sys_renameat2, 5)
744 745
745#define __NR_syscall_count 337 746#define __NR_seccomp 337
747__SYSCALL(337, sys_seccomp, 3)
748#define __NR_getrandom 338
749__SYSCALL(338, sys_getrandom, 3)
750#define __NR_memfd_create 339
751__SYSCALL(339, sys_memfd_create, 2)
752
753#define __NR_syscall_count 340
746 754
747/* 755/*
748 * sysxtensa syscall handler 756 * sysxtensa syscall handler