diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 09:32:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 09:32:45 -0700 |
| commit | d7b1fd9140c266c956bf1b4a2c3329aff8da5323 (patch) | |
| tree | 770ef10f0f9834b9c82143a1c7756f9a8ec686bc | |
| parent | f7dbaef50558c08917a18f390c2609f253dc6659 (diff) | |
| parent | 5e467e27b7c7a11ef47068138248003e873674a1 (diff) | |
| download | linux-d7b1fd9140c266c956bf1b4a2c3329aff8da5323.tar.gz linux-d7b1fd9140c266c956bf1b4a2c3329aff8da5323.tar.bz2 linux-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
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
3 files changed, 3 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 diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h index 7de0a2d65da4..99801c3be914 100644 --- a/arch/ia64/include/uapi/asm/unistd.h +++ b/arch/ia64/include/uapi/asm/unistd.h @@ -328,5 +328,6 @@ #define __NR_sched_setattr 1336 #define __NR_sched_getattr 1337 #define __NR_renameat2 1338 +#define __NR_getrandom 1339 #endif /* _UAPI_ASM_IA64_UNISTD_H */ diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index ba3d03503e84..4c13837a9269 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1776,6 +1776,7 @@ sys_call_table: data8 sys_sched_setattr data8 sys_sched_getattr data8 sys_renameat2 + data8 sys_getrandom .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |