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

Commit 5fab517d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ia64 fix from Tony Luck:
 "Wire up mlock2() syscall for ia64"

* tag 'please-pull-mlock2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable mlock2 syscall for ia64
parents ca43444e 27801885

arch/ia64/include/asm/unistd.h

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






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

#define NR_syscalls			323 /* 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
@@ -335,5 +335,6 @@ 
#define __NR_userfaultfd		1343

#define __NR_membarrier			1344

#define __NR_kcmp			1345

#define __NR_mlock2			1346



#endif /* _UAPI_ASM_IA64_UNISTD_H */

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -1771,5 +1771,6 @@ sys_call_table: 
	data8 sys_userfaultfd

	data8 sys_membarrier

	data8 sys_kcmp				// 1345

	data8 sys_mlock2



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