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

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

Merge tag 'please-pull-preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 update from Tony Luck:
 "Wire up new system calls p{read,write}v2 for ia64"

* tag 'please-pull-preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable preadv2 and pwritev2 syscalls for ia64
parents c155c749 2d5ae5c2

arch/ia64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 






#define NR_syscalls			324 /* length of syscall table */

#define NR_syscalls			326 /* length of syscall table */



/*

 * The following defines stop scripts/checksyscalls.sh from complaining about

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

+2 −0
Original line number Diff line number Diff line
@@ -337,5 +337,7 @@ 
#define __NR_kcmp			1345

#define __NR_mlock2			1346

#define __NR_copy_file_range		1347

#define __NR_preadv2			1348

#define __NR_pwritev2			1349



#endif /* _UAPI_ASM_IA64_UNISTD_H */

arch/ia64/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -1773,5 +1773,7 @@ sys_call_table: 
	data8 sys_kcmp				// 1345

	data8 sys_mlock2

	data8 sys_copy_file_range

	data8 sys_preadv2

	data8 sys_pwritev2



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls