From ea5a07968439a79a770fb35071ba555c2c3c54b5 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 7 May 2013 09:21:07 +0000 Subject: [PATCH] preadv, pwritev: fix number of syscall arguments The number of preadv and pwritev arguments depends on architecture and personality. For 64bit and ilp32 it equals to 4, for unaligned 32bit it equals to 5, and for aligned 32bit it equals to 6. * linux/aarch64/syscallent1.h: Change the number of preadv and pwritev arguments to 4. * linux/alpha/syscallent.h: Likewise. * linux/ia64/syscallent.h: Likewise. * linux/mips/syscallent-n32.h: Likewise. * linux/mips/syscallent-n64.h: Likewise. * linux/s390x/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/tile/syscallent.h: Likewise. * linux/x32/syscallent.h: Likewise. * linux/x86_64/syscallent.h: Likewise. * linux/powerpc/syscallent.h: Change the number of preadv and pwritev arguments to 6. * linux/sh/syscallent.h: Likewise. * linux/xtensa/syscallent.h: Likewise. --- linux/aarch64/syscallent1.h | 4 ++-- linux/alpha/syscallent.h | 4 ++-- linux/ia64/syscallent.h | 4 ++-- linux/mips/syscallent-n32.h | 4 ++-- linux/mips/syscallent-n64.h | 4 ++-- linux/powerpc/syscallent.h | 4 ++-- linux/s390x/syscallent.h | 4 ++-- linux/sh/syscallent.h | 4 ++-- linux/sh64/syscallent.h | 4 ++-- linux/tile/syscallent.h | 4 ++-- linux/x32/syscallent.h | 8 ++++---- linux/x86_64/syscallent.h | 4 ++-- linux/xtensa/syscallent.h | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/linux/aarch64/syscallent1.h b/linux/aarch64/syscallent1.h index 461609cb..58edc5ed 100644 --- a/linux/aarch64/syscallent1.h +++ b/linux/aarch64/syscallent1.h @@ -67,8 +67,8 @@ { 3, TD, sys_writev, "writev" }, /* 66 */ { 5, TD, sys_pread, "pread64" }, /* 67 */ { 5, TD, sys_pwrite, "pwrite64" }, /* 68 */ - { 5, TD, sys_preadv, "preadv" }, /* 69 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 70 */ + { 4, TD, sys_preadv, "preadv" }, /* 69 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 70 */ { 4, TD|TN, sys_sendfile64, "sendfile" }, /* 71 */ { 6, TD, sys_pselect6, "pselect6" }, /* 72 */ { 5, TD, sys_ppoll, "ppoll" }, /* 73 */ diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index 9062e95f..05e23fd4 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -516,8 +516,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 487 */ { 2, TD, sys_pipe2, "pipe2" }, /* 488 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 489 */ - { 5, TD, sys_preadv, "preadv" }, /* 490 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 491 */ + { 4, TD, sys_preadv, "preadv" }, /* 490 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 491 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 492 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 493 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 494 */ diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index 43f132dc..7c88976a 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -1101,8 +1101,8 @@ { 3, TD|TS, sys_signalfd, "signalfd" }, /* 1307 */ { 4, TD, sys_timerfd, "timerfd" }, /* 1308 */ { 1, TD, sys_eventfd, "eventfd" }, /* 1309 */ - { 5, TD, sys_preadv, "preadv" }, /* 1319 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 1320 */ + { 4, TD, sys_preadv, "preadv" }, /* 1319 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 1320 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 1321 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 1322 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 1323 */ diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h index d85c80d2..8dce9267 100644 --- a/linux/mips/syscallent-n32.h +++ b/linux/mips/syscallent-n32.h @@ -293,8 +293,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 6290 */ { 2, TD, sys_pipe2, "pipe2" }, /* 6291 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 6292 */ - { 5, TD, sys_preadv, "preadv" }, /* 6293 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 6294 */ + { 4, TD, sys_preadv, "preadv" }, /* 6293 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 6294 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 6295 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 6296 */ { 4, TN, sys_accept4, "accept4" }, /* 6297 */ diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h index 70d9364a..9b9bea28 100644 --- a/linux/mips/syscallent-n64.h +++ b/linux/mips/syscallent-n64.h @@ -289,8 +289,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 5286 */ { 2, TD, sys_pipe2, "pipe2" }, /* 5287 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 5288 */ - { 5, TD, sys_preadv, "preadv" }, /* 5289 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 5290 */ + { 4, TD, sys_preadv, "preadv" }, /* 5289 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 5290 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 5291 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 5292 */ { 4, TN, sys_accept4, "accept4" }, /* 5293 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 38694319..8db525dd 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -346,8 +346,8 @@ { 2, TD, sys_pipe2, "pipe2" }, /* 317 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 318 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 319 */ - { 5, TD, sys_preadv, "preadv" }, /* 320 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 321 */ + { 6, TD, sys_preadv, "preadv" }, /* 320 */ + { 6, TD, sys_pwritev, "pwritev" }, /* 321 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 322 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 323 */ { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 324 */ diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 18636be6..4c4f18b0 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -355,8 +355,8 @@ { 2, TD, sys_pipe2, "pipe2" }, /* 325 */ { 3, TD, sys_dup3, "dup3" }, /* 326 */ { 1, TD, sys_epoll_create1, "epoll_create1" }, /* 327 */ - { 5, TD, sys_preadv, "preadv" }, /* 328 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 329 */ + { 4, TD, sys_preadv, "preadv" }, /* 328 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 329 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 330 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 331 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 332 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index f9de8820..577a4f65 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -363,8 +363,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 330 */ { 2, TD, sys_pipe2, "pipe2" }, /* 331 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 332 */ - { 5, TD, sys_preadv, "preadv" }, /* 333 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 334 */ + { 6, TD, sys_preadv, "preadv" }, /* 333 */ + { 6, TD, sys_pwritev, "pwritev" }, /* 334 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 335 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 336 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 337 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index e104a8d3..e4a4b22d 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -387,8 +387,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 358 */ { 2, TD, sys_pipe2, "pipe2" }, /* 359 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 360 */ - { 5, TD, sys_preadv, "preadv" }, /* 361 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 362 */ + { 4, TD, sys_preadv, "preadv" }, /* 361 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 362 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 363 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 364 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 365 */ diff --git a/linux/tile/syscallent.h b/linux/tile/syscallent.h index 9a57e631..8ea68fd6 100644 --- a/linux/tile/syscallent.h +++ b/linux/tile/syscallent.h @@ -67,8 +67,8 @@ { 3, TD, sys_writev, "writev" }, /* 66 */ { 6, TD, sys_pread, "pread64" }, /* 67 */ { 6, TD, sys_pwrite, "pwrite64" }, /* 68 */ - { 5, TD, sys_preadv, "preadv" }, /* 69 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 70 */ + { 4, TD, sys_preadv, "preadv" }, /* 69 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 70 */ { 4, TD|TN, sys_sendfile64, "sendfile" }, /* 71 */ { 6, TD, sys_pselect6, "pselect6" }, /* 72 */ { 5, TD, sys_ppoll, "ppoll" }, /* 73 */ diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h index 47b61084..6a95b15a 100644 --- a/linux/x32/syscallent.h +++ b/linux/x32/syscallent.h @@ -293,8 +293,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 292 */ { 2, TD, sys_pipe2, "pipe2" }, /* 293 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 294 */ - { 5, TD, printargs, "64:preadv" }, /* 295 */ - { 5, TD, printargs, "64:pwritev" }, /* 296 */ + { 4, TD, printargs, "64:preadv" }, /* 295 */ + { 4, TD, printargs, "64:pwritev" }, /* 296 */ { 4, TP|TS, printargs, "64:rt_tgsigqueueinfo"}, /* 297 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 298 */ { 5, TN, printargs, "64:recvmmsg" }, /* 299 */ @@ -335,8 +335,8 @@ { 3, 0, sys_get_robust_list, "get_robust_list" }, /* 531 */ { 4, TD, sys_vmsplice, "vmsplice" }, /* 532 */ { 6, TM, sys_move_pages, "move_pages" }, /* 533 */ - { 5, TD, sys_preadv, "preadv" }, /* 534 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 535 */ + { 4, TD, sys_preadv, "preadv" }, /* 534 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 535 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 536 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 537 */ { 4, TN, sys_sendmmsg, "sendmmsg" }, /* 538 */ diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index e7ddba69..005752cf 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -293,8 +293,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 292 */ { 2, TD, sys_pipe2, "pipe2" }, /* 293 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 294 */ - { 5, TD, sys_preadv, "preadv" }, /* 295 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 296 */ + { 4, TD, sys_preadv, "preadv" }, /* 295 */ + { 4, TD, sys_pwritev, "pwritev" }, /* 296 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 297 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 298 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 299 */ diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h index afa58c82..fdfec375 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -307,8 +307,8 @@ { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 314 */ { 0, 0, printargs, "SYS_315" }, /* 315 */ { 2, TD, sys_eventfd2, "eventfd2" }, /* 316 */ - { 5, TD, sys_preadv, "preadv" }, /* 317 */ - { 5, TD, sys_pwritev, "pwritev" }, /* 318 */ + { 6, TD, sys_preadv, "preadv" }, /* 317 */ + { 6, TD, sys_pwritev, "pwritev" }, /* 318 */ [319] = { }, { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 320 */ { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 321 */ -- 2.40.0