Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b1fd91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f7dbaef5 5e467e27

arch/ia64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -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 */