From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 4 Oct 2012 22:01:55 +0000 (+0100)
Subject: Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcod... 
X-Git-Tag: MMI-PSA29.97-13-9~15819^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba4a63f89c8f8a014450e45fd96a06a5e078e52f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcodes' and 'syscall' into for-linus
---

ba4a63f89c8f8a014450e45fd96a06a5e078e52f
diff --cc arch/arm/include/asm/unistd.h
index 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,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.
        */