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

Commit 22c6b32d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up process_vm_{read,write}v
parents 77a7300a 5bf1e97d

arch/m68k/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -350,10 +350,12 @@ 
#define __NR_clock_adjtime	342

#define __NR_syncfs		343

#define __NR_setns		344

#define __NR_process_vm_readv	345

#define __NR_process_vm_writev	346



#ifdef __KERNEL__



#define NR_syscalls		345

#define NR_syscalls		347



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/m68k/kernel/syscalltable.S

+2 −0
Original line number Diff line number Diff line
@@ -365,4 +365,6 @@ ENTRY(sys_call_table) 
	.long sys_clock_adjtime

	.long sys_syncfs

	.long sys_setns

	.long sys_process_vm_readv	/* 345 */

	.long sys_process_vm_writev