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

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

Linus Torvalds 22c6b32d 77a7300a

+5 -1
+3 -1
arch/m68k/include/asm/unistd.h
··· 350 350 #define __NR_clock_adjtime 342 351 351 #define __NR_syncfs 343 352 352 #define __NR_setns 344 353 + #define __NR_process_vm_readv 345 354 + #define __NR_process_vm_writev 346 353 355 354 356 #ifdef __KERNEL__ 355 357 356 - #define NR_syscalls 345 358 + #define NR_syscalls 347 357 359 358 360 #define __ARCH_WANT_IPC_PARSE_VERSION 359 361 #define __ARCH_WANT_OLD_READDIR
+2
arch/m68k/kernel/syscalltable.S
··· 365 365 .long sys_clock_adjtime 366 366 .long sys_syncfs 367 367 .long sys_setns 368 + .long sys_process_vm_readv /* 345 */ 369 + .long sys_process_vm_writev 368 370