diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 16:07:18 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 16:07:18 -0800 |
| commit | 97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c (patch) | |
| tree | a71115af6c30fdc9de0878e2cf1c51e95b17a324 /arch/s390/include/uapi/asm/unistd.h | |
| parent | ef47fa5280819deaa8da7e0db1d875b225de5838 (diff) | |
| parent | c8af781ebf3ffe37c18c34ca89e29c085560e561 (diff) | |
Merge branch 'bfin_rotary' into next
Merge bfin_rotary driver changes from Sonic Zhang.
Diffstat (limited to 'arch/s390/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/s390/include/uapi/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h index 2b446cf0cc65..67878af257a0 100644 --- a/arch/s390/include/uapi/asm/unistd.h +++ b/arch/s390/include/uapi/asm/unistd.h @@ -289,7 +289,8 @@ #define __NR_bpf 351 #define __NR_s390_pci_mmio_write 352 #define __NR_s390_pci_mmio_read 353 -#define NR_syscalls 354 +#define __NR_execveat 354 +#define NR_syscalls 355 /* * There are some system calls that are not present on 64 bit, some |