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

Commit 11ed3e0e authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

MIPS: Wire up new pkey_{mprotect,alloc,free} syscalls 



Signed-off-by: default avatarMarcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14380/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29fbff86

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

+16 −6
Original line number Diff line number Diff line
@@ -383,16 +383,20 @@ 
#define __NR_copy_file_range		(__NR_Linux + 360)

#define __NR_preadv2			(__NR_Linux + 361)

#define __NR_pwritev2			(__NR_Linux + 362)

#define __NR_pkey_mprotect		(__NR_Linux + 363)

#define __NR_pkey_alloc			(__NR_Linux + 364)

#define __NR_pkey_free			(__NR_Linux + 365)





/*

 * Offset of the last Linux o32 flavoured syscall

 */

#define __NR_Linux_syscalls		362

#define __NR_Linux_syscalls		365



#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */



#define __NR_O32_Linux			4000

#define __NR_O32_Linux_syscalls		362

#define __NR_O32_Linux_syscalls		365



#if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -723,16 +727,19 @@ 
#define __NR_copy_file_range		(__NR_Linux + 320)

#define __NR_preadv2			(__NR_Linux + 321)

#define __NR_pwritev2			(__NR_Linux + 322)

#define __NR_pkey_mprotect		(__NR_Linux + 323)

#define __NR_pkey_alloc			(__NR_Linux + 324)

#define __NR_pkey_free			(__NR_Linux + 325)



/*

 * Offset of the last Linux 64-bit flavoured syscall

 */

#define __NR_Linux_syscalls		322

#define __NR_Linux_syscalls		325



#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */



#define __NR_64_Linux			5000

#define __NR_64_Linux_syscalls		322

#define __NR_64_Linux_syscalls		325



#if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -1067,15 +1074,18 @@ 
#define __NR_copy_file_range		(__NR_Linux + 324)

#define __NR_preadv2			(__NR_Linux + 325)

#define __NR_pwritev2			(__NR_Linux + 326)

#define __NR_pkey_mprotect		(__NR_Linux + 327)

#define __NR_pkey_alloc			(__NR_Linux + 328)

#define __NR_pkey_free			(__NR_Linux + 329)



/*

 * Offset of the last N32 flavoured syscall

 */

#define __NR_Linux_syscalls		326

#define __NR_Linux_syscalls		329



#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */



#define __NR_N32_Linux			6000

#define __NR_N32_Linux_syscalls		326

#define __NR_N32_Linux_syscalls		329



#endif /* _UAPI_ASM_UNISTD_H */

arch/mips/kernel/scall32-o32.S

+3 −0
Original line number Diff line number Diff line
@@ -597,3 +597,6 @@ EXPORT(sys_call_table) 
	PTR	sys_copy_file_range		/* 4360 */

	PTR	sys_preadv2

	PTR	sys_pwritev2

	PTR	sys_pkey_mprotect

	PTR	sys_pkey_alloc

	PTR	sys_pkey_free			/* 4365 */

arch/mips/kernel/scall64-64.S

+3 −0
Original line number Diff line number Diff line
@@ -435,4 +435,7 @@ EXPORT(sys_call_table) 
	PTR	sys_copy_file_range		/* 5320 */

	PTR	sys_preadv2

	PTR	sys_pwritev2

	PTR	sys_pkey_mprotect

	PTR	sys_pkey_alloc

	PTR	sys_pkey_free			/* 5325 */

	.size	sys_call_table,.-sys_call_table

arch/mips/kernel/scall64-n32.S

+3 −0
Original line number Diff line number Diff line
@@ -430,4 +430,7 @@ EXPORT(sysn32_call_table) 
	PTR	sys_copy_file_range

	PTR	compat_sys_preadv2		/* 6325 */

	PTR	compat_sys_pwritev2

	PTR	sys_pkey_mprotect

	PTR	sys_pkey_alloc

	PTR	sys_pkey_free

	.size	sysn32_call_table,.-sysn32_call_table

arch/mips/kernel/scall64-o32.S

+3 −0
Original line number Diff line number Diff line
@@ -585,4 +585,7 @@ EXPORT(sys32_call_table) 
	PTR	sys_copy_file_range		/* 4360 */

	PTR	compat_sys_preadv2

	PTR	compat_sys_pwritev2

	PTR	sys_pkey_mprotect

	PTR	sys_pkey_alloc

	PTR	sys_pkey_free			/* 4365 */

	.size	sys32_call_table,.-sys32_call_table