]> granicus.if.org Git - strace/commitdiff
fanotify_mark: fix number of args for 32bit arches
authorMike Frysinger <vapier@gentoo.org>
Mon, 19 Aug 2013 05:00:39 +0000 (01:00 -0400)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 11 Sep 2013 13:58:26 +0000 (13:58 +0000)
The fanotify_mark func takes a 64bit mask, so 32bit arches have to split
it up into two fields.  When the syscall was added, it was listed as only
having 5 fields total (since that's correct for 64bit systems).

* linux/arm/syscallent.h: Set the number of fanotify_mark arguments to 6.
* linux/bfin/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/metag/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent-o32.h: Likewise.
* linux/or1k/syscallent.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/tile/syscallent1.h: Likewise.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Chris Metcalf <cmetcalf@tilera.com> [for tile]
14 files changed:
linux/arm/syscallent.h
linux/bfin/syscallent.h
linux/hppa/syscallent.h
linux/i386/syscallent.h
linux/m68k/syscallent.h
linux/metag/syscallent.h
linux/microblaze/syscallent.h
linux/mips/syscallent-o32.h
linux/or1k/syscallent.h
linux/powerpc/syscallent.h
linux/s390/syscallent.h
linux/sh/syscallent.h
linux/sparc/syscallent.h
linux/tile/syscallent1.h

index 132b22ad8aea66c434983e99426c8f6eaed5d114..f9b2b9a924848a2f77f72fd8abcf26f4e08d14a3 100644 (file)
        { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 365 */
        { 4,    TN,     sys_accept4,            "accept4"       }, /* 366 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 367 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 368 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 368 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 369 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 370 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 371 */
index cc03eaf053aa485cdce790f1f8f4e6342d33c0b2..64db1a9131fc5c5bc2fc84924c9ba095ecbcef2d 100644 (file)
        { 5,    TD,     sys_perf_event_open,    "perf_event_open"       }, /* 369 */
        { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 370 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 371 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 372 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 372 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 373 */
        { 3,    0,      sys_cacheflush,         "cacheflush"    }, /* 374 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"     }, /* 375 */
index 4ce2dc2091fca3d93953617ed3f999d22ededc33..21e4ae729c41758299597612221f7f0d742a7b41 100644 (file)
        { 4,    TN,     sys_accept4,            "accept4"               }, /* 320 */
        { 4,    0,      sys_prlimit64,          "prlimit64"             }, /* 321 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init"         }, /* 322 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark"         }, /* 323 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark"         }, /* 323 */
        { 2,    0,      sys_clock_adjtime,      "clock_adjtime"         }, /* 324 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"     }, /* 325 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"     }, /* 326 */
index 480a28e61f8ffc687f4e53f58ca6759a4bb5bcea..1f759e47d58c764c934cc16f98f4e99090a28fb9 100644 (file)
        { 5,    TD,     sys_perf_event_open,    "perf_event_open"}, /* 336 */
        { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 337 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 338 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 339 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 339 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 340 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 341 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 342 */
index d3eec794bf8a5fe2f46ff21b95455f44adc4bb99..adf9f5b9580b2bfcb07e15701ee56393adf20964 100644 (file)
        { 6,    0,      printargs,              "atomic_comxchg_32"}, /* 335 */
        { 0,    0,      printargs,              "atomic_barrier"}, /* 336 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 337 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 338 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 338 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 339 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 340 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 341 */
index 9401ca46ffb98b4d79b9fa29be496a0817557fc0..6216ac637879df8b1721a36e61966a94e00d6623 100644 (file)
        { 4,    TP,     sys_wait4,                      "wait4"                 }, /* 260 */
        { 4,    0,      sys_prlimit64,                  "prlimit64"             }, /* 261 */
        { 2,    TD,     sys_fanotify_init,              "fanotify_init"         }, /* 262 */
-       { 5,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"         }, /* 263 */
+       { 6,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"         }, /* 263 */
        { 5,    TD|TF,  sys_name_to_handle_at,          "name_to_handle_at"     }, /* 264 */
        { 3,    TD,     sys_open_by_handle_at,          "open_by_handle_at"     }, /* 265 */
        { 2,    0,      sys_clock_adjtime,              "clock_adjtime"         }, /* 266 */
index 22b69c48adc7ed75844cb5aa26b1a00699900da6..38f8bba8e37c6af5df52ca23a2e0fe273389758a 100644 (file)
        { 5,    TD,     sys_perf_event_open,    "perf_event_open"       }, /* 366 */
        { 5,    TN,     printargs,              "recvmmsg"      }, /* 367 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 368 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 369 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 369 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 370 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 371 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 372 */
index c23ac1466753c346f83f411f020d1e5d3ab3287d..3431b8143161e684e13b201c60afdec0d278393e 100644 (file)
        { 4,    TN,     sys_accept4,            "accept4"       }, /* 4334 */
        { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 4335 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 4336 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 4337 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 4337 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 4338 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 4339 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 4340 */
        { 4,    TN,     printargs,              "o32_accept4"   }, /* 4334 */
        { 5,    TN,     printargs,              "o32_recvmmsg"  }, /* 4335 */
        { 2,    TD,     printargs,              "o32_fanotify_init" }, /* 4336 */
-       { 5,    TD|TF,  printargs,              "o32_fanotify_mark" }, /* 4337 */
+       { 6,    TD|TF,  printargs,              "o32_fanotify_mark" }, /* 4337 */
        { 4,    0,      printargs,              "o32_prlimit64" }, /* 4338 */
        { 5,    TD|TF,  printargs,              "o32_name_to_handle_at"}, /* 4339 */
        { 3,    TD,     printargs,              "o32_open_by_handle_at"}, /* 4340 */
index d1122126f7234ad77ad78152baa98110d6a31e4d..a45c52f3a44c332dc5ec088964bc361b5226abc8 100644 (file)
        { 4,    TP,     sys_wait4,                      "wait4"                 }, /* 260 */
        { 4,    0,      sys_prlimit64,                  "prlimit64"             }, /* 261 */
        { 2,    TD,     sys_fanotify_init,              "fanotify_init"         }, /* 262 */
-       { 5,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"         }, /* 263 */
+       { 6,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"         }, /* 263 */
        { 5,    TD|TF,  sys_name_to_handle_at,          "name_to_handle_at"     }, /* 264 */
        { 3,    TD,     sys_open_by_handle_at,          "open_by_handle_at"     }, /* 265 */
        { 2,    0,      sys_clock_adjtime,              "clock_adjtime"         }, /* 266 */
index d84a8f4825df9081621da7bf933d0e16f0de6979..6f0cb7c5fb3bc97d0fe2289ddce22d8a5c2bd9b5 100644 (file)
        { 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 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark"         }, /* 324 */
        { 4,    0,      sys_prlimit64,          "prlimit64"             }, /* 325 */
        { 3,    TN,     sys_socket,             "socket"                }, /* 326 */
        { 3,    TN,     sys_bind,               "bind"                  }, /* 327 */
index 719029f4e3afabe929e2204d5b60075f1b7d7a62..2a0bc21d649c5dab0583107abfe4fdc5e674de66 100644 (file)
        { 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 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 333 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 333 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 334 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 335 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 336 */
index b51fc6ff594e9a41e5ba1c18f7ff1315c1d76e88..bd337aee7b52f70903731be5c93098853f536996 100644 (file)
        { 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 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 338 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 338 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 339 */
        { 3,    TN,     sys_socket,             "socket"        }, /* 340 */
        { 3,    TN,     sys_bind,               "bind"          }, /* 341 */
index 804e8c36bfab993639e269cee48e5656b5041f4c..d5df8e15e6a3a90d5d9d43d8e833f5514c788b9a 100644 (file)
        { 5,    TD,     sys_perf_event_open,    "perf_event_open"}, /* 327 */
        { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 328 */
        { 2,    TD,     sys_fanotify_init,      "fanotify_init" }, /* 329 */
-       { 5,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 330 */
+       { 6,    TD|TF,  sys_fanotify_mark,      "fanotify_mark" }, /* 330 */
        { 4,    0,      sys_prlimit64,          "prlimit64"     }, /* 331 */
        { 5,    TD|TF,  sys_name_to_handle_at,  "name_to_handle_at"}, /* 332 */
        { 3,    TD,     sys_open_by_handle_at,  "open_by_handle_at"}, /* 333 */
index 9f205218c7baf52741612e4a3d2383c38a4b4eb2..94b7737d4ce2f5397deb1da2421c66df5e72accf 100644 (file)
        { 4,    TP,     sys_wait4,                      "wait4"                         }, /*  260 */
        { 4,    0,      sys_prlimit64,                  "prlimit64"                     }, /*  261 */
        { 2,    TD,     sys_fanotify_init,              "fanotify_init"                 }, /*  262 */
-       { 5,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"                 }, /*  263 */
+       { 6,    TD|TF,  sys_fanotify_mark,              "fanotify_mark"                 }, /*  263 */
        { 5,    TD|TF,  sys_name_to_handle_at,          "name_to_handle_at"             }, /*  264 */
        { 3,    TD,     sys_open_by_handle_at,          "open_by_handle_at"             }, /*  265 */
        { 2,    0,      sys_clock_adjtime,              "clock_adjtime"                 }, /*  266 */