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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k update from Geert Uytterhoeven.

Just wiring up the bpf system call.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up bpf
parents 2084becb f7bbd12a

arch/m68k/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <uapi/asm/unistd.h>





#define NR_syscalls		354

#define NR_syscalls		355



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

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

+1 −0
Original line number Diff line number Diff line
@@ -359,5 +359,6 @@ 
#define __NR_renameat2		351

#define __NR_getrandom		352

#define __NR_memfd_create	353

#define __NR_bpf		354



#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

arch/m68k/kernel/syscalltable.S

+1 −0
Original line number Diff line number Diff line
@@ -374,4 +374,5 @@ ENTRY(sys_call_table) 
	.long sys_renameat2

	.long sys_getrandom

	.long sys_memfd_create

	.long sys_bpf