Messages in this thread Patch in this message | | | Date | Mon, 15 Aug 2011 14:52:51 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in arch/x86/include/asm/unistd_64.h between commit fce8dc06423d ("x86-64: Wire up getcpu syscall") from Linus' tree and commit ("Add x86_64 specific wire up") from the akpm tree.
I have fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index d92641c..f9fff6a 100644 --- a/arch/x86/include/asm/unistd_64.h +++ b/arch/x86/include/asm/unistd_64.h @@ -683,6 +683,10 @@ __SYSCALL(__NR_sendmmsg, sys_sendmmsg) __SYSCALL(__NR_setns, sys_setns) #define __NR_getcpu 309 __SYSCALL(__NR_getcpu, sys_getcpu) +#define __NR_process_vm_readv 310 +__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv) +#define __NR_process_vm_writev 311 +__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev) #ifndef __NO_STUBS #define __ARCH_WANT_OLD_READDIR
| |