]> granicus.if.org Git - strace/commitdiff
preadv, pwritev: fix number of syscall arguments
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 7 May 2013 09:21:07 +0000 (09:21 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 7 May 2013 09:43:54 +0000 (09:43 +0000)
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.

13 files changed:
linux/aarch64/syscallent1.h
linux/alpha/syscallent.h
linux/ia64/syscallent.h
linux/mips/syscallent-n32.h
linux/mips/syscallent-n64.h
linux/powerpc/syscallent.h
linux/s390x/syscallent.h
linux/sh/syscallent.h
linux/sh64/syscallent.h
linux/tile/syscallent.h
linux/x32/syscallent.h
linux/x86_64/syscallent.h
linux/xtensa/syscallent.h

index 461609cb7e34d6a6e46ccbb58d72500d2f54cfd1..58edc5edddce133bc292f333f1d0023ac4fd5498 100644 (file)
@@ -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 */
index 9062e95f098241354b69b9996aea350c2e0e33df..05e23fd4f9a3b08d1cbe5938ba7e9e13a46afaf9 100644 (file)
        { 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 */
index 43f132dc2cae2ee5e69f0914ada1af4694eeeb24..7c88976a4d76b96227ddc2f5255fd952695cb867 100644 (file)
        { 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 */
index d85c80d28e2ef723b0a275dcc968e22147a430f9..8dce9267d2365debbdde79ab083c1577f4c9a6d0 100644 (file)
        { 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 */
index 70d9364a8d8f84723689c8deb875e547c1214ddf..9b9bea2830e90ba49dc4ad5f9dc93c07ec26092e 100644 (file)
        { 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 */
index 3869431963e51119f2ae2c75d17c8eec0ea40386..8db525dd086139e80d4d36bffbbfd99bd96ba4b5 100644 (file)
        { 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 */
index 18636be64ebd2604e3fbcbe021bd4789977d2e5e..4c4f18b027eebf5894a7137f0ffa4d11c6cb384e 100644 (file)
        { 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 */
index f9de88203f738d38f59f4f4c0b08cfc0786f1ec0..577a4f65d31a7581c1511c7bc76a09a52bf4bc5b 100644 (file)
        { 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 */
index e104a8d36557b0368d2188de6d7d58b6799d6baa..e4a4b22dc9c1aa5562a253e6bc0b7b5ece57f00d 100644 (file)
        { 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 */
index 9a57e631a10266183c0b2a5f03b45c8949150bf2..8ea68fd66722acca1d76f7fd203ea9098e877edf 100644 (file)
@@ -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 */
index 47b61084fc82b3c4fa07cff23396847f533bca8d..6a95b15a6854249c0ec4d3b984258cc0810ee709 100644 (file)
        { 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 */
        { 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 */
index e7ddba699b453b907ff4fe6de07505fa5456c22b..005752cf4f990b7081fd7616cd5f09cc75a56dd4 100644 (file)
        { 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 */
index afa58c82106dde8205f57a5d88be36e5f091f2cd..fdfec375a8b5d21bc0e40f533a5c3508894588f4 100644 (file)
        { 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 */