aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390/unistd.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-05-17 14:51:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-05-17 14:51:24 -0400
commit5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch)
treec56ff327b1dfa8868b4208aea9ac4158e3bfe308 /include/asm-s390/unistd.h
parentf03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff)
parent0c056c50a6218e0e577817c16ba8851af593d742 (diff)
downloadkernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip
kernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.gz
kernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.bz2
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-s390/unistd.h')
-rw-r--r--include/asm-s390/unistd.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 657d582..41c2792 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -296,8 +296,14 @@
#define __NR_pselect6 301
#define __NR_ppoll 302
#define __NR_unshare 303
+#define __NR_set_robust_list 304
+#define __NR_get_robust_list 305
+#define __NR_splice 306
+#define __NR_sync_file_range 307
+#define __NR_tee 308
+#define __NR_vmsplice 309
-#define NR_syscalls 304
+#define NR_syscalls 310
/*
* There are some system calls that are not present on 64 bit, some