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 tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixlet from Michael Ellerman:
"Wire up sys_mlock2()"

* tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: Wire up sys_mlock2()

Linus Torvalds 2f255351 86eaf54d

+3 -1
+1
arch/powerpc/include/asm/systbl.h
··· 382 382 SYSCALL(shmdt) 383 383 SYSCALL(shmget) 384 384 COMPAT_SYS(shmctl) 385 + SYSCALL(mlock2)
+1 -1
arch/powerpc/include/asm/unistd.h
··· 12 12 #include <uapi/asm/unistd.h> 13 13 14 14 15 - #define __NR_syscalls 378 15 + #define __NR_syscalls 379 16 16 17 17 #define __NR__exit __NR_exit 18 18 #define NR_syscalls __NR_syscalls
+1
arch/powerpc/include/uapi/asm/unistd.h
··· 400 400 #define __NR_shmdt 375 401 401 #define __NR_shmget 376 402 402 #define __NR_shmctl 377 403 + #define __NR_mlock2 378 403 404 404 405 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */