tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 fb762340 ce00a967

+5 -1
+1 -1
arch/m68k/include/asm/unistd.h
··· 4 4 #include <uapi/asm/unistd.h> 5 5 6 6 7 - #define NR_syscalls 352 7 + #define NR_syscalls 354 8 8 9 9 #define __ARCH_WANT_OLD_READDIR 10 10 #define __ARCH_WANT_OLD_STAT
+2
arch/m68k/include/uapi/asm/unistd.h
··· 357 357 #define __NR_sched_setattr 349 358 358 #define __NR_sched_getattr 350 359 359 #define __NR_renameat2 351 360 + #define __NR_getrandom 352 361 + #define __NR_memfd_create 353 360 362 361 363 #endif /* _UAPI_ASM_M68K_UNISTD_H_ */
+2
arch/m68k/kernel/syscalltable.S
··· 372 372 .long sys_sched_setattr 373 373 .long sys_sched_getattr /* 350 */ 374 374 .long sys_renameat2 375 + .long sys_getrandom 376 + .long sys_memfd_create 375 377