diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
| commit | a584143b01ce69803116ae8d0a4db382acc728d7 (patch) | |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d /arch/arm/include/uapi | |
| parent | 4c94e13e9caed09103419c087f436d79f9d2faba (diff) | |
| parent | 8116bf4cb62d337c953cfa5369ef4cf83e73140c (diff) | |
| download | talos-obmc-linux-a584143b01ce69803116ae8d0a4db382acc728d7.tar.gz talos-obmc-linux-a584143b01ce69803116ae8d0a4db382acc728d7.zip | |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these
lock patches.
Diffstat (limited to 'arch/arm/include/uapi')
| -rw-r--r-- | arch/arm/include/uapi/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index 705bb7620673..0c3f5a0dafd3 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h @@ -413,6 +413,7 @@ #define __NR_getrandom (__NR_SYSCALL_BASE+384) #define __NR_memfd_create (__NR_SYSCALL_BASE+385) #define __NR_bpf (__NR_SYSCALL_BASE+386) +#define __NR_execveat (__NR_SYSCALL_BASE+387) /* * The following SWIs are ARM private. |
