Skip to content

Commit

Permalink
Merge tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history 
…l/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()
  • Loading branch information
Linus Torvalds committed Nov 20, 2015
2 parents 86eaf54 + 1451ad0 commit 2f25535
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/systbl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,3 +382,4 @@ COMPAT_SYS(shmat)
SYSCALL(shmdt)
SYSCALL(shmget)
COMPAT_SYS(shmctl)
SYSCALL(mlock2)
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/unistd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/include/uapi/asm/unistd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

0 comments on commit 2f25535

Please sign in to comment.