diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 06:00:02 +0300 |
commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /arch/parisc/include/uapi/asm/unistd.h | |
parent | d537543b3948bc3bc9dede248fa455493e055457 (diff) | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
download | linux-998f468f34f41905051556a9897dbc204b1b75b4.tar.xz |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'arch/parisc/include/uapi/asm/unistd.h')
-rw-r--r-- | arch/parisc/include/uapi/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h index 2e639d7604f6..33170384d3ac 100644 --- a/arch/parisc/include/uapi/asm/unistd.h +++ b/arch/parisc/include/uapi/asm/unistd.h @@ -358,8 +358,10 @@ #define __NR_memfd_create (__NR_Linux + 340) #define __NR_bpf (__NR_Linux + 341) #define __NR_execveat (__NR_Linux + 342) +#define __NR_membarrier (__NR_Linux + 343) +#define __NR_userfaultfd (__NR_Linux + 344) -#define __NR_Linux_syscalls (__NR_execveat + 1) +#define __NR_Linux_syscalls (__NR_userfaultfd + 1) #define __IGNORE_select /* newselect */ |