Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-u…

…pstreaming Pull c6x arch fixes from Mark Salter: - Add __NR_kcmp to generic syscall list - C6X: Use generic asm/barrier.h * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: syscalls: add __NR_kcmp syscall to generic unistd.h c6x: use asm-generic/barrier.h
mariux64 · Sep 26, 2012 · 5e19997 · 5e19997
2 parents 7106891 + 11ef4cf
commit 5e19997
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
@@ -2,6 +2,7 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += atomic.h
 generic-y += auxvec.h
+generic-y += barrier.h
 generic-y += bitsperlong.h
 generic-y += bugs.h
 generic-y += cputime.h

diff --git a/arch/c6x/include/asm/barrier.h b/arch/c6x/include/asm/barrier.h
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
@@ -691,9 +691,11 @@ __SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \
 #define __NR_process_vm_writev 271
 __SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
           compat_sys_process_vm_writev)
+#define __NR_kcmp 272
+__SYSCALL(__NR_kcmp, sys_kcmp)
 
 #undef __NR_syscalls
-#define __NR_syscalls 272
+#define __NR_syscalls 273
 
 /*
  * All syscalls below here should go away really,