summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-27 01:28:17 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-27 01:28:17 +0400
commit5e19997a742c7c8203be628a7a69babc3bcf01a4 (patch)
treef9735a535b5d97530d36d0900f5e212063bbefd9 /include
parent7106891a5c5960782801366ac49e47aa996b662f (diff)
parent11ef4cfac935ab45eb4c7f98d26c78ee69627909 (diff)
downloadlinux-5e19997a742c7c8203be628a7a69babc3bcf01a4.tar.xz
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
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
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/unistd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 991ef01cd77e..3748ec92dcbc 100644
--- 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,