arch: update s390/s390x system call tables

s390 and s390x gained quite a few new system calls:
- numa related system calls
- the separated socket system calls
- two more s390 specific pci mmio system calls

All architectures got the new membarrier and userfaultfd system calls.

This patch updates the s390 specific system call tables and updates other
architectures where needed.

Also remove some extra whitespace from the s390 specific system call tables.

Both 'make check' and './regression -T live' still work for s390 and s390x
after this update.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>

1 files changed, 36 insertions, 32 deletions

diff --git a/src/arch-s390-syscalls.c b/src/arch-s390-syscalls.c
index 4da63ed..9b24abe 100644
--- a/src/arch-s390-syscalls.c
+++ b/src/arch-s390-syscalls.c
@@ -10,13 +10,13 @@
 #include "arch.h"
 #include "arch-s390.h"
 
-/* NOTE: based on Linux 4.2-rc5 */
+/* NOTE: based on Linux 4.3 */
 const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "_llseek", 140 },
 	{ "_newselect", 142 },
 	{ "_sysctl", 149 },
 	{ "accept", __PNR_accept },
-	{ "accept4", __PNR_accept4 },
+	{ "accept4", 364 },
 	{ "access", 33 },
 	{ "acct", 51 },
 	{ "add_key", 278 },
@@ -27,7 +27,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "arm_sync_file_range", __PNR_arm_sync_file_range },
 	{ "arch_prctl", __PNR_arch_prctl },
 	{ "bdflush", 134 },
-	{ "bind", __PNR_bind },
+	{ "bind", 361 },
 	{ "bpf", 351 },
 	{ "break", __PNR_break },
 	{ "breakpoint", __PNR_breakpoint },
@@ -48,7 +48,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "clock_settime", 259 },
 	{ "clone", 120 },
 	{ "close", 6 },
-	{ "connect", __PNR_connect },
+	{ "connect", 362 },
 	{ "creat", 8 },
 	{ "create_module", 127 },
 	{ "delete_module", 129 },
@@ -102,8 +102,8 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "futex", 238 },
 	{ "futimesat", 292 },
 	{ "get_kernel_syms", 130 },
-	{ "get_mempolicy", __PNR_get_mempolicy },
-	{ "get_robust_list" , 305 },
+	{ "get_mempolicy", 269 },
+	{ "get_robust_list", 305 },
 	{ "get_thread_area", __PNR_get_thread_area },
 	{ "getcpu", 311 },
 	{ "getcwd", 183 },
@@ -118,7 +118,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "getgroups", 80 },
 	{ "getgroups32", 205 },
 	{ "getitimer", 105 },
-	{ "getpeername", __PNR_getpeername },
+	{ "getpeername", 368 },
 	{ "getpgid", 132 },
 	{ "getpgrp", 65 },
 	{ "getpid", 20 },
@@ -133,8 +133,8 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "getrlimit", 76 },
 	{ "getrusage", 77 },
 	{ "getsid", 147 },
-	{ "getsockname", __PNR_getsockname },
-	{ "getsockopt", __PNR_getsockopt },
+	{ "getsockname", 367 },
+	{ "getsockopt", 365 },
 	{ "gettid", 236 },
 	{ "gettimeofday", 78 },
 	{ "getuid", 24 },
@@ -143,10 +143,10 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "gtty", __PNR_gtty },
 	{ "idle", 112 },
 	{ "init_module", 128 },
-	{ "inotify_add_watch" , 285 },
+	{ "inotify_add_watch", 285 },
 	{ "inotify_init", 284 },
 	{ "inotify_init1", 324 },
-	{ "inotify_rm_watch" , 286 },
+	{ "inotify_rm_watch", 286 },
 	{ "io_cancel", 247 },
 	{ "io_destroy", 244 },
 	{ "io_getevents", 245 },
@@ -168,7 +168,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "lgetxattr", 228 },
 	{ "link", 9 },
 	{ "linkat", 296 },
-	{ "listen", __PNR_listen },
+	{ "listen", 363 },
 	{ "listxattr", 230 },
 	{ "llistxattr", 231 },
 	{ "lock", __PNR_lock },
@@ -179,9 +179,10 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "lstat", 107 },
 	{ "lstat64", 196 },
 	{ "madvise", 219 },
-	{ "mbind", __PNR_mbind },
+	{ "mbind", 268 },
+	{ "membarrier", 356 },
 	{ "memfd_create", 350 },
-	{ "migrate_pages", __PNR_migrate_pages},
+	{ "migrate_pages", 287 },
 	{ "mincore", 218 },
 	{ "mkdir", 39 },
 	{ "mkdirat", 289 },
@@ -193,13 +194,13 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "mmap2", 192 },
 	{ "modify_ldt", __PNR_modify_ldt },
 	{ "mount", 21 },
-	{ "move_pages", __PNR_move_pages},
+	{ "move_pages", 310 },
 	{ "mprotect", 125 },
 	{ "mpx", __PNR_mpx },
 	{ "mq_getsetattr", 276 },
 	{ "mq_notify", 275 },
 	{ "mq_open", 271 },
-	{ "mq_timedreceive" , 274 },
+	{ "mq_timedreceive", 274 },
 	{ "mq_timedsend", 273 },
 	{ "mq_unlink", 272 },
 	{ "mremap", 163 },
@@ -260,9 +261,9 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "readv", 145 },
 	{ "reboot", 88 },
 	{ "recv", __PNR_recv },
-	{ "recvfrom", __PNR_recvfrom },
-	{ "recvmmsg", __PNR_recvmmsg },
-	{ "recvmsg", __PNR_recvmsg },
+	{ "recvfrom", 371 },
+	{ "recvmmsg", 357 },
+	{ "recvmsg", 372 },
 	{ "remap_file_pages", 267 },
 	{ "removexattr", 233 },
 	{ "rename", 38 },
@@ -280,15 +281,17 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "rt_sigtimedwait", 177 },
 	{ "rt_tgsigqueueinfo", 330 },
 	{ "rtas", __PNR_rtas },
+	{ "s390_pci_mmio_read", 353 },
+	{ "s390_pci_mmio_write", 352 },
 	{ "s390_runtime_instr", 342 },
 	{ "sched_get_priority_max", 159 },
 	{ "sched_get_priority_min", 160 },
-	{ "sched_getaffinity" , 240 },
+	{ "sched_getaffinity", 240 },
 	{ "sched_getattr", 346 },
 	{ "sched_getparam", 155 },
 	{ "sched_getscheduler", 157 },
 	{ "sched_rr_get_interval", 161 },
-	{ "sched_setaffinity" , 239 },
+	{ "sched_setaffinity", 239 },
 	{ "sched_setattr", 345 },
 	{ "sched_setparam", 154 },
 	{ "sched_setscheduler", 156 },
@@ -303,11 +306,11 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "send", __PNR_send },
 	{ "sendfile", 187 },
 	{ "sendfile64", 223 },
-	{ "sendmmsg", __PNR_sendmmsg },
-	{ "sendmsg", __PNR_sendmsg },
-	{ "sendto", __PNR_sendto },
-	{ "set_mempolicy", __PNR_set_mempolicy },
-	{ "set_robust_list" , 304 },
+	{ "sendmmsg", 358 },
+	{ "sendmsg", 370 },
+	{ "sendto", 369 },
+	{ "set_mempolicy", 270 },
+	{ "set_robust_list", 304 },
 	{ "set_thread_area", __PNR_set_thread_area },
 	{ "set_tid_address", 252 },
 	{ "set_tls", __PNR_set_tls },
@@ -335,7 +338,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "setreuid32", 203 },
 	{ "setrlimit", 75 },
 	{ "setsid", 66 },
-	{ "setsockopt", __PNR_setsockopt },
+	{ "setsockopt", 366 },
 	{ "settimeofday", 79 },
 	{ "setuid", 23 },
 	{ "setuid32", 213 },
@@ -345,7 +348,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "shmctl", __PNR_shmctl },
 	{ "shmdt", __PNR_shmdt },
 	{ "shmget", __PNR_shmget },
-	{ "shutdown", __PNR_shutdown },
+	{ "shutdown", 373 },
 	{ "sigaction", 67 },
 	{ "sigaltstack", 186 },
 	{ "signal", 48 },
@@ -355,9 +358,9 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "sigprocmask", 126 },
 	{ "sigreturn", 119 },
 	{ "sigsuspend", 72 },
-	{ "socket", __PNR_socket },
+	{ "socket", 359 },
 	{ "socketcall", 102 },
-	{ "socketpair", __PNR_socketpair },
+	{ "socketpair", 360 },
 	{ "splice", 306 },
 	{ "spu_create", __PNR_spu_create },
 	{ "spu_run", __PNR_spu_run },
@@ -376,7 +379,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "symlink", 83 },
 	{ "symlinkat", 297 },
 	{ "sync", 36 },
-	{ "sync_file_range" , 307 },
+	{ "sync_file_range", 307 },
 	{ "sync_file_range2", __PNR_sync_file_range2 },
 	{ "syncfs", 338 },
 	{ "syscall", __PNR_syscall },
@@ -387,7 +390,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "sysmips", __PNR_sysmips },
 	{ "tee", 308 },
 	{ "tgkill", 241 },
-	{ "time",  13 },
+	{ "time", 13 },
 	{ "timer_create", 254 },
 	{ "timer_delete", 258 },
 	{ "timer_getoverrun", 257 },
@@ -414,6 +417,7 @@ const struct arch_syscall_def s390_syscall_table[] = { \
 	{ "uselib", 86 },
 	{ "usr26", __PNR_usr26 },
 	{ "usr32", __PNR_usr32 },
+	{ "userfaultfd", 355 },
 	{ "ustat", 62 },
 	{ "utime", 30 },
 	{ "utimensat", 315 },