Move socket and ipc subcall entries to subcall.h

Syscall entries for socket and ipc subcalls are the same on all
architectures, or at least they should be the same, so move them
to the single file.

* linux/subcall.h: Add syscall entries for socket and ipc subcalls.
* linux/arm/syscallent.h: Remove entries for socket and ipc subcalls.
* linux/i386/syscallent.h: Likewise.
* 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.

diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index 6dff25e826c0783f9fc484e968dab89433f79622..5bde8bd9469de81d7b8cf4a53daf59f4223bad65 100644 (file)
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -431,58 +431,9 @@
        { 5,    0,      NULL,                   NULL            }, /* 397 */
        { 5,    0,      NULL,                   NULL            }, /* 398 */
        { 5,    0,      NULL,                   NULL            }, /* 399 */
-#define SYS_socket_subcall     400
-#include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-# if SYS_ipc_subcall != 420
-#  error fix me
-# endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */
-# define ARM_LAST_ORDINARY_SYSCALL 444
+# define SYS_socket_subcall    400
+# include "subcall.h"
+# define ARM_LAST_ORDINARY_SYSCALL (SYS_socket_subcall + SYS_socket_nsubcalls + SYS_ipc_nsubcalls - 1)
 #endif /* !EABI */
 
        /* __ARM_NR_cmpxchg (0x000ffff0).

diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index fea5a25d6961f1bf109822fb75bb9d4ad6f72b75..ba991a5a57222cad0e628ed4881c246e30759198 100644 (file)
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -430,52 +430,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index 155f01cf7a7596beb1011e8f84634fc99fa86c2a..b267ca88402d7137f907b896ddaceb3475094b4a 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -428,52 +428,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */

diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index 5eb5a3ce0a01faa1d7049b24acb8764701a534d5..9d43ef519f2da8814eb80ff4fa2a47a31d703ca9 100644 (file)
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -428,55 +428,6 @@
        { 5,    0,      NULL,                   NULL                    }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */
        { 5,    0,      NULL,                   NULL            }, /* 445 */
        { 5,    0,      NULL,                   NULL            }, /* 446 */
        { 5,    0,      NULL,                   NULL            }, /* 447 */

diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
index 26dc35a9080255f3f25c805103adc3ee944c96de..41e747c4c43c164572fa72713708b87ccf9a34f0 100644 (file)
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@@ -430,52 +430,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */

diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
index aae69b51fed5d415f2de327ee1975201a4e4725f..9566602606de1cd0136814964e64cdc26f344a19 100644 (file)
--- a/linux/s390x/syscallent.h
+++ b/linux/s390x/syscallent.h
@@ -429,52 +429,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index f99ddcbbdfe7cfda4edb443c4ee3298abaf260e9..f3c9fdba3fea71218bb099961293dbd99e1d41ea 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -430,53 +430,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */
-       { 4,    TI,     sys_semop,              "semop"         }, /* 421 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 422 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 423 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 429 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 430 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 431 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 432 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 433 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 439 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 440 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 441 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 442 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 443 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 444 */

diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index bb5bb8eca0c023c45f97d86236718efd10162885..e3681f1af0c1b4e43723dc91517ed89225a97366 100644 (file)
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -428,28 +428,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 399 */
 #define SYS_socket_subcall     400
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 400 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 401 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 402 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 403 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 404 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 405 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 406 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 407 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 408 */
-       { 4,    TN,     sys_send,               "send"          }, /* 409 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 410 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 411 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 412 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 413 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 414 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 415 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 416 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 417 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 418 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 419 */
-
-#if SYS_ipc_subcall != 420
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 420 */

diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index a194d5f98c593b7aaa634fafa91d3d53f93668f4..792c56c87066a422697dc3dfb7f7aecfed68b2cb 100644 (file)
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -353,55 +353,3 @@
        { 5,    0,      NULL,                   NULL            }, /* 352 */
 #define SYS_socket_subcall     353
 #include "subcall.h"
-       { 6,    0,      printargs,              "socket_subcall"}, /* 353 */
-       { 3,    TN,     sys_socket,             "socket"        }, /* 354 */
-       { 3,    TN,     sys_bind,               "bind"          }, /* 355 */
-       { 3,    TN,     sys_connect,            "connect"       }, /* 356 */
-       { 2,    TN,     sys_listen,             "listen"        }, /* 357 */
-       { 3,    TN,     sys_accept,             "accept"        }, /* 358 */
-       { 3,    TN,     sys_getsockname,        "getsockname"   }, /* 359 */
-       { 3,    TN,     sys_getpeername,        "getpeername"   }, /* 360 */
-       { 4,    TN,     sys_socketpair,         "socketpair"    }, /* 361 */
-       { 4,    TN,     sys_send,               "send"          }, /* 362 */
-       { 4,    TN,     sys_recv,               "recv"          }, /* 363 */
-       { 6,    TN,     sys_sendto,             "sendto"        }, /* 364 */
-       { 6,    TN,     sys_recvfrom,           "recvfrom"      }, /* 365 */
-       { 2,    TN,     sys_shutdown,           "shutdown"      }, /* 366 */
-       { 5,    TN,     sys_setsockopt,         "setsockopt"    }, /* 367 */
-       { 5,    TN,     sys_getsockopt,         "getsockopt"    }, /* 368 */
-       { 3,    TN,     sys_sendmsg,            "sendmsg"       }, /* 369 */
-       { 3,    TN,     sys_recvmsg,            "recvmsg"       }, /* 370 */
-       { 4,    TN,     sys_accept4,            "accept4"       }, /* 371 */
-       { 5,    TN,     sys_recvmmsg,           "recvmmsg"      }, /* 372 */
-#if SYS_ipc_subcall != 373
- #error fix me
-#endif
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 373 */
-       { 4,    TI,     printargs,              "semop"         }, /* 374 */
-       { 4,    TI,     sys_semget,             "semget"        }, /* 375 */
-       { 4,    TI,     sys_semctl,             "semctl"        }, /* 376 */
-       { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 382 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 383 */
-       { 4,    TI,     sys_msgsnd,             "msgsnd"        }, /* 384 */
-       { 4,    TI,     sys_msgrcv,             "msgrcv"        }, /* 385 */
-       { 4,    TI,     sys_msgget,             "msgget"        }, /* 386 */
-       { 4,    TI,     sys_msgctl,             "msgctl"        }, /* 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,    0,      printargs,              "ipc_subcall"   }, /* 392 */
-       { 4,    0,      printargs,              "ipc_subcall"   }, /* 393 */
-       { 4,    TI|TM|SI,       sys_shmat,              "shmat"         }, /* 394 */
-       { 4,    TI|TM|SI,       sys_shmdt,              "shmdt"         }, /* 395 */
-       { 4,    TI,     sys_shmget,             "shmget"        }, /* 396 */
-       { 4,    TI,     sys_shmctl,             "shmctl"        }, /* 397 */
-       { 5,    0,      NULL,                   NULL            }, /* 398 */
-       { 5,    0,      NULL,                   NULL            }, /* 399 */
-       { 5,    0,      NULL,                   NULL            }, /* 400 */
-       { 5,    0,      NULL,                   NULL            }, /* 401 */

diff --git a/linux/subcall.h b/linux/subcall.h
index 54f7fcaf9bf28375750970f9ac4b81a95d63ae60..96de17941fe1abfa9dca337bffb5b4f0fc14aa20 100644 (file)
--- a/linux/subcall.h
+++ b/linux/subcall.h
@@ -1,6 +1,55 @@
 #ifndef SYS_socket_subcall
 # error SYS_socket_subcall is not defined
 #endif
+
+[SYS_socket_subcall +  0] = { 6,       0,              printargs,                      "socket_subcall"        },
+[SYS_socket_subcall +  1] = { 3,       TN,             sys_socket,                     "socket"                },
+[SYS_socket_subcall +  2] = { 3,       TN,             sys_bind,                       "bind"                  },
+[SYS_socket_subcall +  3] = { 3,       TN,             sys_connect,                    "connect"               },
+[SYS_socket_subcall +  4] = { 2,       TN,             sys_listen,                     "listen"                },
+[SYS_socket_subcall +  5] = { 3,       TN,             sys_accept,                     "accept"                },
+[SYS_socket_subcall +  6] = { 3,       TN,             sys_getsockname,                "getsockname"           },
+[SYS_socket_subcall +  7] = { 3,       TN,             sys_getpeername,                "getpeername"           },
+[SYS_socket_subcall +  8] = { 4,       TN,             sys_socketpair,                 "socketpair"            },
+[SYS_socket_subcall +  9] = { 4,       TN,             sys_send,                       "send"                  },
+[SYS_socket_subcall + 10] = { 4,       TN,             sys_recv,                       "recv"                  },
+[SYS_socket_subcall + 11] = { 6,       TN,             sys_sendto,                     "sendto"                },
+[SYS_socket_subcall + 12] = { 6,       TN,             sys_recvfrom,                   "recvfrom"              },
+[SYS_socket_subcall + 13] = { 2,       TN,             sys_shutdown,                   "shutdown"              },
+[SYS_socket_subcall + 14] = { 5,       TN,             sys_setsockopt,                 "setsockopt"            },
+[SYS_socket_subcall + 15] = { 5,       TN,             sys_getsockopt,                 "getsockopt"            },
+[SYS_socket_subcall + 16] = { 3,       TN,             sys_sendmsg,                    "sendmsg"               },
+[SYS_socket_subcall + 17] = { 3,       TN,             sys_recvmsg,                    "recvmsg"               },
+[SYS_socket_subcall + 18] = { 4,       TN,             sys_accept4,                    "accept4"               },
+[SYS_socket_subcall + 19] = { 5,       TN,             sys_recvmmsg,                   "recvmmsg"              },
+
 #define SYS_socket_nsubcalls   20
-#define SYS_ipc_subcall                ((SYS_socket_subcall)+(SYS_socket_nsubcalls))
+#define SYS_ipc_subcall        ((SYS_socket_subcall) + (SYS_socket_nsubcalls))
+
+[SYS_socket_subcall + 20] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 21] = { 4,       TI,             sys_semop,                      "semop"                 },
+[SYS_socket_subcall + 22] = { 3,       TI,             sys_semget,                     "semget"                },
+[SYS_socket_subcall + 23] = { 4,       TI,             sys_semctl,                     "semctl"                },
+[SYS_socket_subcall + 24] = { 5,       TI,             sys_semtimedop,                 "semtimedop"            },
+[SYS_socket_subcall + 25] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 26] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 27] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 28] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 29] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 30] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 31] = { 4,       TI,             sys_msgsnd,                     "msgsnd"                },
+[SYS_socket_subcall + 32] = { 4,       TI,             sys_msgrcv,                     "msgrcv"                },
+[SYS_socket_subcall + 33] = { 2,       TI,             sys_msgget,                     "msgget"                },
+[SYS_socket_subcall + 34] = { 4,       TI,             sys_msgctl,                     "msgctl"                },
+[SYS_socket_subcall + 35] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 36] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 37] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 38] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 39] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 40] = { 6,       0,              printargs,                      "ipc_subcall"           },
+[SYS_socket_subcall + 41] = { 4,       TI|TM|SI,       sys_shmat,                      "shmat"                 },
+[SYS_socket_subcall + 42] = { 4,       TI|TM|SI,       sys_shmdt,                      "shmdt"                 },
+[SYS_socket_subcall + 43] = { 3,       TI,             sys_shmget,                     "shmget"                },
+[SYS_socket_subcall + 44] = { 4,       TI,             sys_shmctl,                     "shmctl"                },
+
 #define SYS_ipc_nsubcalls      25