From 24f0dcea027058050643659851c3fa7ddb1828dc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 29 Dec 2008 20:04:15 +0000 Subject: [PATCH] * linux/syscallent.h: Mark sendfile(2) as network syscall. * linux/*/syscallent.h: Same, for all architectures. --- ChangeLog | 5 +++++ freebsd/i386/syscallent.h | 2 +- linux/alpha/syscallent.h | 2 +- linux/arm/syscallent.h | 4 ++-- linux/bfin/syscallent.h | 4 ++-- linux/hppa/syscallent.h | 4 ++-- linux/ia64/syscallent.h | 2 +- linux/m68k/syscallent.h | 2 +- linux/mips/syscallent.h | 12 ++++++------ linux/powerpc/syscallent.h | 4 ++-- linux/s390/syscallent.h | 4 ++-- linux/s390x/syscallent.h | 4 ++-- linux/sh/syscallent.h | 4 ++-- linux/sh64/syscallent.h | 4 ++-- linux/sparc/syscallent.h | 4 ++-- linux/syscallent.h | 4 ++-- linux/x86_64/syscallent.h | 2 +- 17 files changed, 36 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45165862..82e9b8c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-29 Nick Black + + * linux/syscallent.h: Mark sendfile(2) as network syscall. + * linux/*/syscallent.h: Same, for all architectures. + 2008-12-29 Denys Vlasenko * defs.h: Remove sigtrap80 field from struct tcb. diff --git a/freebsd/i386/syscallent.h b/freebsd/i386/syscallent.h index 58ee91e6..bb6815e7 100644 --- a/freebsd/i386/syscallent.h +++ b/freebsd/i386/syscallent.h @@ -338,7 +338,7 @@ { 1, 0, sys_sched_get_priority_min, "sched_get_priority_min" }, /* 333 */ { 2, 0, sys_sched_rr_get_interval, "sched_rr_get_interval" }, /* 334 */ { 2, 0, sys_utrace, "utrace" }, /* 335 */ - { 7, TD, sys_sendfile, "sendfile" }, /* 336 */ + { 7, TD|TN, sys_sendfile, "sendfile" }, /* 336 */ { 3, 0, sys_kldsym, "kldsym" }, /* 337 */ { 1, 0, sys_jail, "jail" }, /* 338 */ { -1, 0, printargs, "SYS_339" }, /* 339 */ diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index dc135421..23938291 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -398,7 +398,7 @@ { 2, 0, sys_getcwd, "getcwd" }, /* 367 */ { 2, 0, sys_capget, "capget" }, /* 368 */ { 2, 0, sys_capset, "capset" }, /* 369 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 370 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 370 */ { 3, 0, sys_setresgid, "setresgid" }, /* 371 */ { 3, 0, sys_getresgid, "getresgid" }, /* 372 */ { 4, 0, printargs, "dipc" }, /* 373, not implemented */ diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 6e2caa54..2b8e91ad 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -216,7 +216,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TF, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork" }, /* 190 */ @@ -269,7 +269,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 237 */ { 2, TS, sys_kill, "tkill" }, /* 238 */ - { 4, TF, sys_sendfile64, "sendfile64" }, /* 239 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 239 */ { 6, 0, sys_futex, "futex" }, /* 240 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */ diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 726fdbf0..f5b1af1c 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -215,7 +215,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork", SYS_vfork }, /* 190 */ @@ -267,7 +267,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 237 */ { 2, TS, sys_kill, "tkill" }, /* 238 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 239 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 239 */ { 5, 0, sys_futex, "futex" }, /* 240 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */ diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index b7b67d9f..f3a9978f 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -127,7 +127,7 @@ { 3, 0, sys_madvise, "madvise" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 122 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 122 */ { 6, TN, sys_recvfrom, "recvfrom" }, /* 123 */ { 1, 0, sys_adjtimex, "adjtimex" }, /* 124 */ { 3, 0, sys_mprotect, "mprotect" }, /* 125 */ @@ -214,7 +214,7 @@ { 0, 0, printargs, "gettid" }, /* 206 */ { 4, TD, sys_readahead, "readahead" }, /* 207 */ { 2, TS, sys_kill, "tkill" }, /* 208 */ - { 4, TD, sys_sendfile, "sendfile64" }, /* 209 */ + { 4, TD|TN, sys_sendfile, "sendfile64" }, /* 209 */ { 6, 0, sys_futex, "futex" }, /* 210 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" }, /* 211 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" }, /* 212 */ diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index 1a9c348a..d05ad9ae 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -993,7 +993,7 @@ { 2, TF, sys_getcwd, "getcwd" }, /* 1184 */ { 2, 0, sys_capget, "capget" }, /* 1185 */ { 2, 0, sys_capset, "capset" }, /* 1186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 1187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 1187 */ { 5, TN, printargs, "getpmsg" }, /* 1188 */ { 5, TN, printargs, "putpmsg" }, /* 1189 */ { 3, TN, sys_socket, "socket" }, /* 1190 */ diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index c98ad418..2a72736c 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -215,7 +215,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TF, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork", SYS_vfork }, /* 190 */ diff --git a/linux/mips/syscallent.h b/linux/mips/syscallent.h index 4b9ebf26..11d638d7 100644 --- a/linux/mips/syscallent.h +++ b/linux/mips/syscallent.h @@ -4209,7 +4209,7 @@ { 2, 0, sys_capget, "capget" }, /* 4204 */ { 2, 0, sys_capset, "capset" }, /* 4205 */ { 2, TS, sys_sigaltstack, "sigaltstatck" }, /* 4206 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 4207 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 4207 */ { 0, 0, printargs, "SYS_4208" }, /* 4208 */ { 0, 0, printargs, "SYS_4209" }, /* 4209 */ { 6, 0, sys_mmap, "mmap" }, /* 4210 */ @@ -4239,7 +4239,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 4234 */ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 4235 */ { 2, TS, sys_kill, "tkill" }, /* 4236 */ - { 5, TD, sys_sendfile64, "sendfile64" }, /* 4237 */ + { 5, TD|TN, sys_sendfile64, "sendfile64" }, /* 4237 */ { 6, 0, sys_futex, "futex" }, /* 4238 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity"}, /* 4239 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity"}, /* 4240 */ @@ -4560,7 +4560,7 @@ { 2, TF, printargs, "o32_lremovexattr" }, /* 4234 */ { 2, TD, printargs, "o32_fremovexattr" }, /* 4235 */ { 2, TS, printargs, "o32_tkill" }, /* 4236 */ - { 5, TD, printargs, "o32_sendfile64" }, /* 4237 */ + { 5, TD|TN, printargs, "o32_sendfile64" }, /* 4237 */ { 6, 0, printargs, "o32_futex" }, /* 4238 */ { 3, 0, printargs, "o32_sched_setaffinity"}, /* 4239 */ { 3, 0, printargs, "o32_sched_getaffinity"}, /* 4240 */ @@ -5365,7 +5365,7 @@ { 3, 0, sys_setitimer, "setitimer" }, /* 5036 */ { 1, 0, sys_alarm, "alarm" }, /* 5037 */ { 0, 0, sys_getpid, "getpid" }, /* 5038 */ - { 4, TF, sys_sendfile, "sendfile" }, /* 5039 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 5039 */ { 2, 0, sys_socketcall, "socketcall" }, /* 5040 */ { 3, TN, sys_connect, "connect" }, /* 5041 */ { 3, TN, sys_accept, "accept" }, /* 5042 */ @@ -6591,7 +6591,7 @@ { 3, 0, sys_setitimer, "setitimer" }, /* 6036 */ { 1, 0, sys_alarm, "alarm" }, /* 6037 */ { 0, 0, sys_getpid, "getpid" }, /* 6038 */ - { 4, TF, sys_sendfile, "sendfile" }, /* 6039 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 6039 */ { 2, 0, sys_socketcall, "socketcall" }, /* 6040 */ { 3, TN, sys_connect, "connect" }, /* 6041 */ { 3, TN, sys_accept, "accept" }, /* 6042 */ @@ -6771,7 +6771,7 @@ { 0, 0, printargs, "fadvise64" }, /* 6216 */ { 0, 0, printargs, "statfs64" }, /* 6217 */ { 0, 0, printargs, "fstatfs64" }, /* 6218 */ - { 4, 0, printargs, "sendfile64" }, /* 6219 */ + { 4, TD|TN, printargs, "sendfile64" }, /* 6219 */ { 3, 0, printargs, "timer_create" }, /* 6220 */ { 4, 0, printargs, "timer_settime" }, /* 6221 */ { 2, 0, printargs, "timer_gettime" }, /* 6222 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index a351124b..f472d0d8 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -214,7 +214,7 @@ { 2, 0, sys_capget, "capget" }, /* 183 */ { 2, 0, sys_capset, "capset" }, /* 184 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 185 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 186 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 186 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 187 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 188 */ { 0, TP, sys_vfork, "vfork" }, /* 189 */ @@ -255,7 +255,7 @@ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" }, /* 223 */ { 5, 0, printargs, "SYS_224" }, /* 224 */ { 5, 0, printargs, "tux" }, /* 225 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 226 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 226 */ { 2, 0, sys_io_setup, "io_setup" }, /* 227 */ { 1, 0, sys_io_destroy, "io_destroy" }, /* 228 */ { 5, 0, sys_io_getevents, "io_getevents" }, /* 229 */ diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index 09893ae0..e565d4b8 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -215,7 +215,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork" }, /* 190 */ @@ -251,7 +251,7 @@ { 3, TD, sys_getdents64, "getdents64" }, /* 220 */ { 3, TD, sys_fcntl, "fcntl64" }, /* 221 */ { 4, TD, sys_readahead, "readahead" }, /* 222 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 223 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 223 */ { 5, TF, sys_setxattr, "setxattr" }, /* 224 */ { 5, TF, sys_setxattr, "lsetxattr" }, /* 225 */ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 226 */ diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 334ebb1e..91c08d7d 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -214,7 +214,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork" }, /* 190 */ @@ -250,7 +250,7 @@ { 3, TD, sys_getdents64, "getdents64" }, /* 220 */ { -1, 0, printargs, "SYS_221" }, /* 221 */ { 4, TD, sys_readahead, "readahead" }, /* 222 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 223 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 223 */ { 5, TF, sys_setxattr, "setxattr" }, /* 224 */ { 5, TF, sys_setxattr, "lsetxattr" }, /* 225 */ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 226 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 8129c338..0a5831fe 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -218,7 +218,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, printargs, "SYS_188" }, /* 188 */ { 5, 0, printargs, "SYS_189" }, /* 189 */ { 0, TP, sys_vfork, "vfork" }, /* 190 */ @@ -271,7 +271,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 237 */ { 2, TD, sys_kill, "tkill" }, /* 238 */ - { 5, TD, sys_sendfile64, "sendfile64" }, /* 239 */ + { 5, TD|TN, sys_sendfile64, "sendfile64" }, /* 239 */ { 6, 0, sys_futex, "futex" }, /* 240 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity"}, /* 241 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity"}, /* 242 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index fae704ba..0ad6c49e 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -215,7 +215,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, printargs, "SYS_188" }, /* 188 */ { 5, 0, printargs, "SYS_189" }, /* 189 */ { 0, TP, sys_vfork, "vfork" }, /* 190 */ @@ -295,7 +295,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 264 */ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 265 */ { 2, TD, sys_kill, "tkill" }, /* 266 */ - { 5, TD, sys_sendfile64, "sendfile64" }, /* 267 */ + { 5, TD|TN, sys_sendfile64, "sendfile64" }, /* 267 */ { 6, 0, sys_futex, "futex" }, /* 268 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity"}, /* 269 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity"}, /* 270 */ diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 54b744a2..8af031a7 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -37,7 +37,7 @@ { 0, 0, sys_sync, "sync" }, /* 36 */ { 2, TS, sys_kill, "kill" }, /* 37 */ { 2, TF, sys_stat, "stat" }, /* 38 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 39 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 39 */ { 2, TF, sys_lstat, "lstat" }, /* 40 */ { 2, TD, sys_dup, "dup" }, /* 41 */ { 0, TD, sys_pipe, "pipe" }, /* 42 */ @@ -138,7 +138,7 @@ { 1, TF, sys_rmdir, "rmdir" }, /* 137 */ { 2, TF, sys_utimes, "utimes" }, /* 138 */ { 2, TF, sys_stat64, "stat64" }, /* 139 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 140 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 140 */ { 3, TN, sys_getpeername,"getpeername" }, /* 141 */ { 6, 0, sys_futex, "futex" }, /* 142 */ { 0, 0, printargs, "gettid" }, /* 143 */ diff --git a/linux/syscallent.h b/linux/syscallent.h index 4b895081..ddc808d5 100644 --- a/linux/syscallent.h +++ b/linux/syscallent.h @@ -216,7 +216,7 @@ { 2, 0, sys_capget, "capget" }, /* 184 */ { 2, 0, sys_capset, "capset" }, /* 185 */ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 187 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 187 */ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */ { 0, TP, sys_vfork, "vfork", SYS_vfork }, /* 190 */ @@ -269,7 +269,7 @@ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */ { 2, TD, sys_fremovexattr, "fremovexattr" }, /* 237 */ { 2, TS, sys_kill, "tkill" }, /* 238 */ - { 4, TD, sys_sendfile64, "sendfile64" }, /* 239 */ + { 4, TD|TN, sys_sendfile64, "sendfile64" }, /* 239 */ { 6, 0, sys_futex, "futex" }, /* 240 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */ diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index 4b4eaf03..fd18715e 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -38,7 +38,7 @@ { 1, 0, sys_alarm, "alarm" }, /* 37 */ { 3, 0, sys_setitimer, "setitimer" }, /* 38 */ { 0, 0, sys_getpid, "getpid" }, /* 39 */ - { 4, TD, sys_sendfile, "sendfile" }, /* 40 */ + { 4, TD|TN, sys_sendfile, "sendfile" }, /* 40 */ { 3, TN, sys_socket, "socket" }, /* 41 */ { 3, TN, sys_connect, "connect" }, /* 42 */ { 3, TN, sys_accept, "accept" }, /* 43 */ -- 2.40.0