From: Paolo Bonzini Date: Fri, 14 Aug 2009 10:34:06 +0000 (+0200) Subject: Add accept4 socketcall X-Git-Tag: v4.5.19~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a56b8a8e77e095b6152253dc99fc5f4c226d02f;p=strace Add accept4 socketcall This second patch in the series adds support for accept4 as a socketcall sub-call. Besides the need to renumber all system calls, this poses no problem. Tested on i686. * linux/arm/syscallent.h: Add accept4 socketcall. * linux/m68k/syscallent.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/s390/syscallent.h: Likewise. * linux/s390x/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/syscallent.h: Likewise. * linux/sparc/syscall.h (SYS_sub_accept4): Declare. (SYS_socket_nsubcalls): Update. * linux/syscall.h: Likewise. --- diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 04d1d636..b9eac0fe 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -453,33 +453,34 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ #endif diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index 2a72736c..4fc3564a 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -451,32 +451,33 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index f472d0d8..116edc85 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -451,37 +451,38 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, printargs, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, printargs, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ - { 5, 0, printargs, "SYS_343" }, /* 443 */ - { 5, 0, printargs, "SYS_344" }, /* 444 */ - { 5, 0, printargs, "SYS_345" }, /* 445 */ - { 5, 0, printargs, "SYS_346" }, /* 446 */ - { 5, 0, printargs, "SYS_347" }, /* 447 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ + { 5, 0, printargs, "SYS_343" }, /* 444 */ + { 5, 0, printargs, "SYS_344" }, /* 445 */ + { 5, 0, printargs, "SYS_345" }, /* 446 */ + { 5, 0, printargs, "SYS_346" }, /* 447 */ + { 5, 0, printargs, "SYS_347" }, /* 448 */ diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index b4d0d67d..287f70d9 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -451,32 +451,33 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 81f4c3b6..2149a5eb 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -449,32 +449,33 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 0a5831fe..614dd304 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -454,33 +454,34 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 0ad6c49e..25d06bd9 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -450,8 +450,9 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ diff --git a/linux/sparc/syscall.h b/linux/sparc/syscall.h index ca92e8bb..30bb8f9b 100644 --- a/linux/sparc/syscall.h +++ b/linux/sparc/syscall.h @@ -98,7 +98,7 @@ int sys_semtimedop(); int sys_socket(),sys_bind(),sys_listen(),sys_accept(),sys_connect(); int sys_socketpair(),sys_sendto(),sys_send(),sys_recvfrom(),sys_recv(); int sys_sendmsg(),sys_recvmsg(),sys_shutdown(),sys_setsockopt(),sys_getsockopt(); -int sys_getsockname(),sys_getpeername(),sys_pipe(); +int sys_getsockname(),sys_getpeername(),sys_pipe(),sys_accept4(); int sys_setresuid(), sys_setresgid(), sys_getresuid(), sys_getresgid(), sys_pread(); int sys_pwrite(), sys_getcwd(); @@ -232,8 +232,9 @@ int sys_signalfd(), sys_timerfd(), sys_eventfd(); #define SYS_sub_getsockopt (SYS_socket_subcall + 15) #define SYS_sub_sendmsg (SYS_socket_subcall + 16) #define SYS_sub_recvmsg (SYS_socket_subcall + 17) +#define SYS_sub_accept4 (SYS_socket_subcall + 18) -#define SYS_socket_nsubcalls 18 +#define SYS_socket_nsubcalls 19 #define SYS_ipc_subcall ((SYS_socket_subcall)+(SYS_socket_nsubcalls)) #define SYS_sub_semop (SYS_ipc_subcall + 1) diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 6324bf45..d97394ed 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -372,36 +372,36 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 368 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 369 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 370 */ -#if SYS_ipc_subcall != 371 + { 4, TN, sys_accept4, "accept4" }, /* 371 */ +#if SYS_ipc_subcall != 372 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 371 */ - { 4, TI, printargs, "semop" }, /* 372 */ - { 4, TI, sys_semget, "semget" }, /* 373 */ - { 4, TI, sys_semctl, "semctl" }, /* 374 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 375 */ - { 4, 0, printargs, "ipc_subcall" }, /* 376 */ + { 4, 0, printargs, "ipc_subcall" }, /* 372 */ + { 4, TI, printargs, "semop" }, /* 373 */ + { 4, TI, sys_semget, "semget" }, /* 374 */ + { 4, TI, sys_semctl, "semctl" }, /* 375 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 376 */ { 4, 0, printargs, "ipc_subcall" }, /* 377 */ { 4, 0, printargs, "ipc_subcall" }, /* 378 */ { 4, 0, printargs, "ipc_subcall" }, /* 379 */ { 4, 0, printargs, "ipc_subcall" }, /* 380 */ { 4, 0, printargs, "ipc_subcall" }, /* 381 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 382 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 383 */ - { 4, TI, sys_msgget, "msgget" }, /* 384 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 385 */ - { 4, 0, printargs, "ipc_subcall" }, /* 386 */ + { 4, 0, printargs, "ipc_subcall" }, /* 382 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 383 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 384 */ + { 4, TI, sys_msgget, "msgget" }, /* 385 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 386 */ { 4, 0, printargs, "ipc_subcall" }, /* 387 */ { 4, 0, printargs, "ipc_subcall" }, /* 388 */ { 4, 0, printargs, "ipc_subcall" }, /* 389 */ { 4, 0, printargs, "ipc_subcall" }, /* 390 */ { 4, 0, printargs, "ipc_subcall" }, /* 391 */ - { 4, TI, sys_shmat, "shmat" }, /* 392 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 393 */ - { 4, TI, sys_shmget, "shmget" }, /* 394 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 395 */ - { 5, 0, printargs, "SYS_343" }, /* 396 */ - { 5, 0, printargs, "SYS_344" }, /* 397 */ - { 5, 0, printargs, "SYS_345" }, /* 398 */ - { 5, 0, printargs, "SYS_346" }, /* 399 */ - { 5, 0, printargs, "SYS_347" }, /* 400 */ + { 4, 0, printargs, "ipc_subcall" }, /* 392 */ + { 4, TI, sys_shmat, "shmat" }, /* 393 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 394 */ + { 4, TI, sys_shmget, "shmget" }, /* 395 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 396 */ + { 5, 0, printargs, "SYS_397" }, /* 397 */ + { 5, 0, printargs, "SYS_398" }, /* 398 */ + { 5, 0, printargs, "SYS_399" }, /* 399 */ + { 5, 0, printargs, "SYS_400" }, /* 400 */ diff --git a/linux/syscall.h b/linux/syscall.h index b373ec88..03c8b81b 100644 --- a/linux/syscall.h +++ b/linux/syscall.h @@ -226,8 +226,9 @@ int sys_osf_utimes(); #define SYS_sub_getsockopt (SYS_socket_subcall + 15) #define SYS_sub_sendmsg (SYS_socket_subcall + 16) #define SYS_sub_recvmsg (SYS_socket_subcall + 17) +#define SYS_sub_accept4 (SYS_socket_subcall + 18) -#define SYS_socket_nsubcalls 18 +#define SYS_socket_nsubcalls 19 #endif /* !(ALPHA || MIPS || HPPA) */ /* sys_ipc subcalls */ diff --git a/linux/syscallent.h b/linux/syscallent.h index ddc808d5..9c75a1cb 100644 --- a/linux/syscallent.h +++ b/linux/syscallent.h @@ -452,32 +452,33 @@ { 5, TN, sys_getsockopt, "getsockopt" }, /* 415 */ { 5, TN, sys_sendmsg, "sendmsg" }, /* 416 */ { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ -#if SYS_ipc_subcall != 418 +#if SYS_ipc_subcall != 419 #error fix me #endif - { 4, 0, printargs, "ipc_subcall" }, /* 418 */ - { 4, TI, sys_semop, "semop" }, /* 419 */ - { 4, TI, sys_semget, "semget" }, /* 420 */ - { 4, TI, sys_semctl, "semctl" }, /* 421 */ - { 5, TI, sys_semtimedop, "semtimedop" }, /* 422 */ - { 4, 0, printargs, "ipc_subcall" }, /* 423 */ + { 4, 0, printargs, "ipc_subcall" }, /* 419 */ + { 4, TI, sys_semop, "semop" }, /* 420 */ + { 4, TI, sys_semget, "semget" }, /* 421 */ + { 4, TI, sys_semctl, "semctl" }, /* 422 */ + { 5, TI, sys_semtimedop, "semtimedop" }, /* 423 */ { 4, 0, printargs, "ipc_subcall" }, /* 424 */ { 4, 0, printargs, "ipc_subcall" }, /* 425 */ { 4, 0, printargs, "ipc_subcall" }, /* 426 */ { 4, 0, printargs, "ipc_subcall" }, /* 427 */ { 4, 0, printargs, "ipc_subcall" }, /* 428 */ - { 4, TI, sys_msgsnd, "msgsnd" }, /* 429 */ - { 4, TI, sys_msgrcv, "msgrcv" }, /* 430 */ - { 4, TI, sys_msgget, "msgget" }, /* 431 */ - { 4, TI, sys_msgctl, "msgctl" }, /* 432 */ - { 4, 0, printargs, "ipc_subcall" }, /* 433 */ + { 4, 0, printargs, "ipc_subcall" }, /* 429 */ + { 4, TI, sys_msgsnd, "msgsnd" }, /* 430 */ + { 4, TI, sys_msgrcv, "msgrcv" }, /* 431 */ + { 4, TI, sys_msgget, "msgget" }, /* 432 */ + { 4, TI, sys_msgctl, "msgctl" }, /* 433 */ { 4, 0, printargs, "ipc_subcall" }, /* 434 */ { 4, 0, printargs, "ipc_subcall" }, /* 435 */ { 4, 0, printargs, "ipc_subcall" }, /* 436 */ { 4, 0, printargs, "ipc_subcall" }, /* 437 */ { 4, 0, printargs, "ipc_subcall" }, /* 438 */ - { 4, TI, sys_shmat, "shmat" }, /* 439 */ - { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ - { 4, TI, sys_shmget, "shmget" }, /* 441 */ - { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ + { 4, 0, printargs, "ipc_subcall" }, /* 439 */ + { 4, TI, sys_shmat, "shmat" }, /* 440 */ + { 4, TI, sys_shmdt, "shmdt" }, /* 441 */ + { 4, TI, sys_shmget, "shmget" }, /* 442 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 443 */