Commit f8cb3954 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull m68k fixlet from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up execveat
parents 3fa116e8 f27bd5bf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <uapi/asm/unistd.h> #include <uapi/asm/unistd.h>
#define NR_syscalls 355 #define NR_syscalls 356
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_OLD_STAT
......
...@@ -360,5 +360,6 @@ ...@@ -360,5 +360,6 @@
#define __NR_getrandom 352 #define __NR_getrandom 352
#define __NR_memfd_create 353 #define __NR_memfd_create 353
#define __NR_bpf 354 #define __NR_bpf 354
#define __NR_execveat 355
#endif /* _UAPI_ASM_M68K_UNISTD_H_ */ #endif /* _UAPI_ASM_M68K_UNISTD_H_ */
...@@ -375,4 +375,5 @@ ENTRY(sys_call_table) ...@@ -375,4 +375,5 @@ ENTRY(sys_call_table)
.long sys_getrandom .long sys_getrandom
.long sys_memfd_create .long sys_memfd_create
.long sys_bpf .long sys_bpf
.long sys_execveat /* 355 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment