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-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ba4a63f89c8f8a014450e45fd96a06a5e078e52f;p=linux-edison.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 0cab47d4a83,0cab47d4a83,2fde5fd1acc,0cab47d4a83,0cab47d4a83,0cab47d4a83,a566ec20d48..d9ff5cc3a50
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@@@@@@ -404,8 -404,8 -404,9 -404,8 -404,8 -404,8 -404,16 +404,17 @@@@@@@@
       #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.
        */
       #define __ARM_NR_BASE			(__NR_SYSCALL_BASE+0x0f0000)