Skip to content

Commit f4ca536

Browse files
committed
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
2 parents 2084bec + f7bbd12 commit f4ca536

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

arch/m68k/include/asm/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <uapi/asm/unistd.h>
55

66

7-
#define NR_syscalls 354
7+
#define NR_syscalls 355
88

99
#define __ARCH_WANT_OLD_READDIR
1010
#define __ARCH_WANT_OLD_STAT

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,5 +359,6 @@
359359
#define __NR_renameat2 351
360360
#define __NR_getrandom 352
361361
#define __NR_memfd_create 353
362+
#define __NR_bpf 354
362363

363364
#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

arch/m68k/kernel/syscalltable.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,4 +374,5 @@ ENTRY(sys_call_table)
374374
.long sys_renameat2
375375
.long sys_getrandom
376376
.long sys_memfd_create
377+
.long sys_bpf
377378

0 commit comments

Comments
 (0)