summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-08-18 05:45:09 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-08-18 05:45:09 +1000
commit16b3d09cd4bb62abca3928294e6815b977fac791 (patch)
tree17c023557982c6a19f131f67349810bf76f507fb /arch
parent88eb5e24dabc851f885a29aad6e0e1f1bf84959a (diff)
parent5676d5bfb93b3b8278f1e7e6b8776bac35d82465 (diff)
Merge remote-tracking branch 'microblaze/next'
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/uapi/asm/unistd.h2
-rw-r--r--arch/microblaze/kernel/syscall_table.S2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h
index 4e1ddc930a68..ad5526ad1670 100644
--- a/arch/microblaze/include/uapi/asm/unistd.h
+++ b/arch/microblaze/include/uapi/asm/unistd.h
@@ -399,5 +399,7 @@
#define __NR_sched_setattr 381
#define __NR_sched_getattr 382
#define __NR_renameat2 383
+#define __NR_seccomp 384
+#define __NR_getrandom 385
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 1a23d5d5480c..c7c806db61ce 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -384,3 +384,5 @@ ENTRY(sys_call_table)
.long sys_sched_setattr
.long sys_sched_getattr
.long sys_renameat2
+ .long sys_seccomp
+ .long sys_getrandom /* 385 */