diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:06:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:06:18 -0700 |
| commit | f8d08a1bb4d67d59a995c5fa285009c894a06bec (patch) | |
| tree | 521c712de05b120106101bd9873a4115128ddd7f /arch | |
| parent | Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | microblaze: Wire-up memfd_create syscall (diff) | |
| download | linux-dev-f8d08a1bb4d67d59a995c5fa285009c894a06bec.tar.xz linux-dev-f8d08a1bb4d67d59a995c5fa285009c894a06bec.zip | |
Merge tag 'microblaze-3.17-rc2' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"Wire-up seccomp/getrandom/memfd_create syscalls"
* tag 'microblaze-3.17-rc2' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Wire-up memfd_create syscall
microblaze: Wire-up getrandom syscall
microblaze: Wire-up seccomp syscall
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/include/uapi/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h index 4e1ddc930a68..1c2380bf8fe6 100644 --- a/arch/microblaze/include/uapi/asm/unistd.h +++ b/arch/microblaze/include/uapi/asm/unistd.h @@ -399,5 +399,8 @@ #define __NR_sched_setattr 381 #define __NR_sched_getattr 382 #define __NR_renameat2 383 +#define __NR_seccomp 384 +#define __NR_getrandom 385 +#define __NR_memfd_create 386 #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 1a23d5d5480c..de59ee1d7010 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S @@ -384,3 +384,6 @@ ENTRY(sys_call_table) .long sys_sched_setattr .long sys_sched_getattr .long sys_renameat2 + .long sys_seccomp + .long sys_getrandom /* 385 */ + .long sys_memfd_create |