summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/unistd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-10 17:48:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-10 17:48:17 -0700
commit08b15d13864279aae10443c48cb268d823895b14 (patch)
tree87a415daab890cd28851beb4478595aae1778cdd /arch/arm/include/asm/unistd.h
parent2f422f94eea83f50755df76be8f5ff86ef89ad80 (diff)
parent208fae5c3b9431013ad7bcea07cbcee114e7d163 (diff)
downloadlinux-sh-08b15d13864279aae10443c48cb268d823895b14.tar.gz
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "A couple of small fixes, and wiring up the new syscalls which appeared during the merge window" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8550/1: protect idiv patching against undefined gcc behavior ARM: wire up preadv2 and pwritev2 syscalls ARM: SMP enable of cache maintanence broadcast
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
-rw-r--r--arch/arm/include/asm/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 7b84657fba35..194b69923389 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
* This may need to be greater than __NR_last_syscall+1 in order to
* account for the padding in the syscall table
*/
-#define __NR_syscalls (392)
+#define __NR_syscalls (396)
#define __ARCH_WANT_STAT64
#define __ARCH_WANT_SYS_GETHOSTNAME