diff options
author | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
tree | 501e1fc558de9e56b78e457aa928fa255e660486 /arch/powerpc/include/asm/unistd.h | |
parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
download | linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'arch/powerpc/include/asm/unistd.h')
-rw-r--r-- | arch/powerpc/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index 1f2594d45605..cf12c580f6b2 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h @@ -12,7 +12,7 @@ #include <uapi/asm/unistd.h> -#define NR_syscalls 380 +#define NR_syscalls 382 #define __NR__exit __NR_exit |