diff options
| author | Chris Zankel <chris@zankel.net> | 2015-03-13 00:41:32 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-03-13 00:41:32 +0000 |
| commit | 0372c1abdd0dc22d92b2c803c097399d7e037f81 (patch) | |
| tree | 0df967b988f27c6bf9550e633dc8f4e7bba511a2 /arch/xtensa/include/uapi | |
| parent | 40aad098c2a06b9cccd8ac1ef8407fd1677fe913 (diff) | |
| parent | 01e84c70fe40c8111f960987bcf7f931842e6d07 (diff) | |
Merge tag 'xtensa-for-next-20150304' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa fixes for 4.0:
- make xtfpgs LCD driver functional and configurable. This fixes hardware
lockup on KC705/ML605 boot;
- wire bpf and execveat syscalls;
- provide __NR_sync_file_range2 instead of __NR_sync_file_range, as that's
what xtensa uses.
Diffstat (limited to 'arch/xtensa/include/uapi')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/unistd.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index db5bb72e2f4e..b95c30594355 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -715,7 +715,7 @@ __SYSCALL(323, sys_process_vm_writev, 6) __SYSCALL(324, sys_name_to_handle_at, 5) #define __NR_open_by_handle_at 325 __SYSCALL(325, sys_open_by_handle_at, 3) -#define __NR_sync_file_range 326 +#define __NR_sync_file_range2 326 __SYSCALL(326, sys_sync_file_range2, 6) #define __NR_perf_event_open 327 __SYSCALL(327, sys_perf_event_open, 5) @@ -749,8 +749,12 @@ __SYSCALL(337, sys_seccomp, 3) __SYSCALL(338, sys_getrandom, 3) #define __NR_memfd_create 339 __SYSCALL(339, sys_memfd_create, 2) +#define __NR_bpf 340 +__SYSCALL(340, sys_bpf, 3) +#define __NR_execveat 341 +__SYSCALL(341, sys_execveat, 5) -#define __NR_syscall_count 340 +#define __NR_syscall_count 342 /* * sysxtensa syscall handler |