]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcod...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:55 +0000 (23:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:55 +0000 (23:01 +0100)
1  2  3  4  5  6  7 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/thread_info.h
arch/arm/include/asm/unistd.h
arch/arm/kernel/sched_clock.c

Simple merge
Simple merge
Simple merge
index 0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,2fde5fd1accedda5a00accac967e1985be9c7f08,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,0cab47d4a83ff97a23c7a9d2975cfb855a687e3e,a566ec20d486bd9ee44c69f705ba5077e4df4254..d9ff5cc3a5060177be581772cf22ead601ad4f65
       #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.
        */
Simple merge