Browse Source

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

Pull m68k updates from Geert Uytterhoeven:
 "Wire up new syscalls getrandom and memfd_create"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up memfd_create
  m68k: Wire up getrandom
Linus Torvalds 11 years ago
parent
commit
fb762340e5

+ 1 - 1
arch/m68k/include/asm/unistd.h

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

+ 2 - 0
arch/m68k/include/uapi/asm/unistd.h

@@ -357,5 +357,7 @@
 #define __NR_sched_setattr	349
 #define __NR_sched_setattr	349
 #define __NR_sched_getattr	350
 #define __NR_sched_getattr	350
 #define __NR_renameat2		351
 #define __NR_renameat2		351
+#define __NR_getrandom		352
+#define __NR_memfd_create	353
 
 
 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */
 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */

+ 2 - 0
arch/m68k/kernel/syscalltable.S

@@ -372,4 +372,6 @@ ENTRY(sys_call_table)
 	.long sys_sched_setattr
 	.long sys_sched_setattr
 	.long sys_sched_getattr		/* 350 */
 	.long sys_sched_getattr		/* 350 */
 	.long sys_renameat2
 	.long sys_renameat2
+	.long sys_getrandom
+	.long sys_memfd_create