p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2014-11-03 14:09:33 -08:00
parent 2084becbe1 f7bbd12a4b
commit f4ca536f71
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/unistd.h
View File

@ -4,7 +4,7 @@
#include <uapi/asm/unistd.h> #include <uapi/asm/unistd.h>
#define NR_syscalls 354 #define NR_syscalls 355
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_OLD_STAT

1
arch/m68k/include/uapi/asm/unistd.h
View File

@ -359,5 +359,6 @@
#define __NR_renameat2 351 #define __NR_renameat2 351
#define __NR_getrandom 352 #define __NR_getrandom 352
#define __NR_memfd_create 353 #define __NR_memfd_create 353
#define __NR_bpf 354
#endif /* _UAPI_ASM_M68K_UNISTD_H_ */ #endif /* _UAPI_ASM_M68K_UNISTD_H_ */

1
arch/m68k/kernel/syscalltable.S
View File

@ -374,4 +374,5 @@ ENTRY(sys_call_table)
.long sys_renameat2 .long sys_renameat2
.long sys_getrandom .long sys_getrandom
.long sys_memfd_create .long sys_memfd_create
.long sys_bpf