From: Russell King Date: Fri, 21 Sep 2012 17:00:27 +0000 (+0100) Subject: Merge branches 'arch-timers', 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator... X-Git-Tag: next-20120924~125^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=84230215df895cba1e0177aa8a5af5306960c7a0;p=karo-tx-linux.git Merge branches 'arch-timers', 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcodes' and 'syscall' into for-next --- 84230215df895cba1e0177aa8a5af5306960c7a0 diff --cc arch/arm/include/asm/unistd.h index 0cab47d4a83f,0cab47d4a83f,0cab47d4a83f,2fde5fd1acce,0cab47d4a83f,0cab47d4a83f,0cab47d4a83f,a566ec20d486..d9ff5cc3a506 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h @@@@@@@@@ -404,7 -404,7 -404,7 -404,8 -404,7 -404,7 -404,7 -404,15 +404,16 @@@@@@@@@ #define __NR_setns (__NR_SYSCALL_BASE+375) #define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) #define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) +++ ++++ /* 378 for kcmp */ +++ +++ +++++++ /* +++++++ * This may need to be greater than __NR_last_syscall+1 in order to +++++++ * account for the padding in the syscall table +++++++ */ +++++++ #ifdef __KERNEL__ +++++++ #define __NR_syscalls (380) +++++++ #endif /* __KERNEL__ */ + /* * The following SWIs are ARM private. */