aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-09 09:32:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-09 09:32:45 -0700
commitd7b1fd9140c266c956bf1b4a2c3329aff8da5323 (patch)
tree770ef10f0f9834b9c82143a1c7756f9a8ec686bc /arch/ia64/include/asm
parentMerge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff)
parent[IA64] Wire up getrandom() system call (diff)
downloadlinux-dev-d7b1fd9140c266c956bf1b4a2c3329aff8da5323.tar.xz
linux-dev-d7b1fd9140c266c956bf1b4a2c3329aff8da5323.zip
Merge tag 'please-pull-getrandom' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 system call update from Tony Luck: "Wire up getrandom system call for ia64" * tag 'please-pull-getrandom' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Wire up getrandom() system call
Diffstat (limited to 'arch/ia64/include/asm')
-rw-r--r--arch/ia64/include/asm/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index fb13dc5e8f8c..4254f5d3218c 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -11,7 +11,7 @@
-#define NR_syscalls 315 /* length of syscall table */
+#define NR_syscalls 316 /* length of syscall table */
/*
* The following defines stop scripts/checksyscalls.sh from complaining about