diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-16 04:29:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-16 04:29:21 +0300 |
| commit | f8cb3954a2ddbeb5c58231988ed39f4d8c9a561b (patch) | |
| tree | 250c6d46c6683ec09ed8d2cd2f8f47706e1d79b1 | |
| parent | 3fa116e8bdd94b4075cfb1e927f8c1fd3e31f582 (diff) | |
| parent | f27bd5bfeda5881ce283aa06408c8fa99fb950fa (diff) | |
| download | linux-f8cb3954a2ddbeb5c58231988ed39f4d8c9a561b.tar.xz | |
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
| -rw-r--r-- | arch/m68k/include/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/m68k/kernel/syscalltable.S | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 75e75d7b1702..244e0dbe45db 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -4,7 +4,7 @@ #include <uapi/asm/unistd.h> -#define NR_syscalls 355 +#define NR_syscalls 356 #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h index 2c1bec9a14b6..61fb6cb9d2ae 100644 --- a/arch/m68k/include/uapi/asm/unistd.h +++ b/arch/m68k/include/uapi/asm/unistd.h @@ -360,5 +360,6 @@ #define __NR_getrandom 352 #define __NR_memfd_create 353 #define __NR_bpf 354 +#define __NR_execveat 355 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index 2ca219e184cd..a0ec4303f2c8 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S @@ -375,4 +375,5 @@ ENTRY(sys_call_table) .long sys_getrandom .long sys_memfd_create .long sys_bpf + .long sys_execveat /* 355 */ |