diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-18 04:35:16 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-18 04:35:16 -0500 |
| commit | 6e5ed276374c329b93a968d640f4d26c8c05411b (patch) | |
| tree | 3b0d42269f0f52ea7764511de3a58b01d12bcb23 /arch/m68k/include | |
| parent | d79a8869d8a4b565b12a88faeff834b09a36368c (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge commit 'v3.2-rc6' into x86/platform
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/unistd.h | 4 |
1 files changed, 3 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 @@ | |||
| 350 | #define __NR_clock_adjtime 342 | 350 | #define __NR_clock_adjtime 342 |
| 351 | #define __NR_syncfs 343 | 351 | #define __NR_syncfs 343 |
| 352 | #define __NR_setns 344 | 352 | #define __NR_setns 344 |
| 353 | #define __NR_process_vm_readv 345 | ||
| 354 | #define __NR_process_vm_writev 346 | ||
| 353 | 355 | ||
| 354 | #ifdef __KERNEL__ | 356 | #ifdef __KERNEL__ |
| 355 | 357 | ||
| 356 | #define NR_syscalls 345 | 358 | #define NR_syscalls 347 |
| 357 | 359 | ||
| 358 | #define __ARCH_WANT_IPC_PARSE_VERSION | 360 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 359 | #define __ARCH_WANT_OLD_READDIR | 361 | #define __ARCH_WANT_OLD_READDIR |