diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 16:12:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 16:12:14 -0800 |
| commit | 22c6b32d8d9b7adf903c19b7e108062431fdc6fc (patch) | |
| tree | 969f847dfce4bb0e59b8f148b429132d7ed4ef0c /arch | |
| parent | 77a7300abad7fe01891b400e88d746f97307ee5a (diff) | |
| parent | 5bf1e97dc34bf09643815ed48be3d1761a5985e1 (diff) | |
| download | linux-22c6b32d8d9b7adf903c19b7e108062431fdc6fc.tar.bz2 | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/unistd.h | 4 | ||||
| -rw-r--r-- | arch/m68k/kernel/syscalltable.S | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 43f984e93970..303192fc9260 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -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 diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index c468f2edaa85..ce827b376110 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S @@ -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 |