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

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

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

Pull ia64 update from Tony Luck:
 "Wire up bpf syscall for ia64"

* tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable bpf syscall for ia64
parents 31003e3a 5dab4b73

arch/ia64/include/asm/unistd.h

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






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

#define NR_syscalls			318 /* 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
@@ -330,5 +330,6 @@ 
#define __NR_renameat2			1338

#define __NR_getrandom			1339

#define __NR_memfd_create		1340

#define __NR_bpf			1341



#endif /* _UAPI_ASM_IA64_UNISTD_H */

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -1778,6 +1778,7 @@ sys_call_table: 
	data8 sys_renameat2

	data8 sys_getrandom

	data8 sys_memfd_create			// 1340

	data8 sys_bpf



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

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */