Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f255351 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 86eaf54d 1451ad03

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -382,3 +382,4 @@ COMPAT_SYS(shmat) 
SYSCALL(shmdt)

SYSCALL(shmget)

COMPAT_SYS(shmctl)

SYSCALL(mlock2)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>





#define __NR_syscalls		378

#define __NR_syscalls		379



#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls

arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -400,5 +400,6 @@ 
#define __NR_shmdt		375

#define __NR_shmget		376

#define __NR_shmctl		377

#define __NR_mlock2		378



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */