diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 12:32:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 12:32:45 -0400 |
| commit | d7b1fd9140c266c956bf1b4a2c3329aff8da5323 (patch) | |
| tree | 770ef10f0f9834b9c82143a1c7756f9a8ec686bc /arch/ia64/kernel | |
| parent | f7dbaef50558c08917a18f390c2609f253dc6659 (diff) | |
| parent | 5e467e27b7c7a11ef47068138248003e873674a1 (diff) | |
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/kernel')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
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: | |||
| 1776 | data8 sys_sched_setattr | 1776 | data8 sys_sched_setattr |
| 1777 | data8 sys_sched_getattr | 1777 | data8 sys_sched_getattr |
| 1778 | data8 sys_renameat2 | 1778 | data8 sys_renameat2 |
| 1779 | data8 sys_getrandom | ||
| 1779 | 1780 | ||
| 1780 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1781 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1781 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1782 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |