2006-01-12 Roland McGrath <roland@redhat.com>

	* signal.c [LINUX] (sys_restart_syscall): New function.
	* linux/syscall.h: Declare sys_restart_syscall.
	* linux/sparc/syscall.h: Likewise.
	* linux/syscallent.h: Call 0 is restart_syscall.
	* linux/arm/syscallent.h: Likewise.
	* linux/powerpc/syscallent.h: Likewise.
	* linux/m68k/syscallent.h: Likewise.
	* linux/hppa/syscallent.h: Likewise.
	* linux/sh/syscallent.h: Likewise.
	* linux/sparc/syscallent.h: Likewise.
	* linux/sparc64/syscallent.h: Likewise.
	* linux/alpha/syscallent.h: Use sys_restart_syscall.
	* linux/ia64/syscallent.h: Likewise.
	* linux/mips/syscallent.h: Likewise.
	* linux/x86_64/syscallent.h: Likewise.

diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
index 0f0556c7c43d2b9139622b3d4f6ca6fbf2c5fa52..4eb817942ede953deff937c38414f85d6c4b4ab8 100644 (file)
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@@ -440,7 +440,7 @@
        { 4,    TD,     sys_epoll_wait,         "epoll_wait"            }, /* 409 */
        { 5,    0,      sys_remap_file_pages,   "remap_file_pages"      }, /* 410 */
        { 1,    0,      printargs,              "set_tid_address"       }, /* 411 */
-       { 0,    0,      printargs,              "restart_syscall"       }, /* 412 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"       }, /* 412 */
        { 4,    0,      printargs,              "fadvise"               }, /* 413 */
        { 3,    0,      sys_timer_create,       "timer_create"          }, /* 414 */
        { 4,    0,      sys_timer_settime,      "timer_settime"         }, /* 415 */

diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index d19f7989eb44172a0aa5387e914f4a323c0c0804..569c7bfc5701c7bbbb12e97bc57cbc9bce176840 100644 (file)
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -28,7 +28,7 @@
  *     $Id$
  */
 
-       { 0,    0,      sys_setup,              "setup"         }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"}, /* 0 */
        { 1,    TP,     sys_exit,               "_exit"         }, /* 1 */
        { 0,    TP,     sys_fork,               "fork"          }, /* 2 */
        { 3,    0,      sys_read,               "read"          }, /* 3 */

diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index f897bebeb150eaec9680bc1bb315ce8dd797c5f7..f4c9dd6781f380e40286be2d6f12828252757e72 100644 (file)
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -5,7 +5,7 @@
  *
  */
 
-       { 5,    0,      printargs,              "SYS_0"                 }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"       }, /* 0 */
        { 1,    TP,     sys_exit,               "exit"                  }, /* 1 */
        { 0,    TP,     sys_fork,               "fork"                  }, /* 2 */
        { 3,    TD,     sys_read,               "read"                  }, /* 3 */

diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index cc43a38b29c9d40e99ed4dd3cf42b4734e553ae2..006e64df8790728cf14795c09be24587aacf21f3 100644 (file)
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -1149,7 +1149,7 @@
        { 1,    0,      sys_epoll_create,       "epoll_create"  }, /* 1243 */
        { 4,    TD,     sys_epoll_ctl,          "epoll_ctl"     }, /* 1244 */
        { 4,    TD,     sys_epoll_wait,         "epoll_wait"    }, /* 1245 */
-       { 0,    0,      printargs,              "restart_syscall"}, /* 1246 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"}, /* 1246 */
        { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 1247 */
        { 3,    0,      sys_timer_create,       "timer_create"  }, /* 1248 */
        { 4,    0,      sys_timer_settime,      "timer_settime" }, /* 1249 */

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index c16b0f0a85ea780637f43e63e997b54da99ef96b..b89077b93e3aeb8d756db81ec1bc2a93a8b8810f 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -28,7 +28,7 @@
  *     $Id$
  */
 
-       { 0,    0,      sys_setup,              "setup"         }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall" }, /* 0 */
        { 1,    TP,     sys_exit,               "_exit", SYS_exit }, /* 1 */
        { 0,    TP,     sys_fork,               "fork", SYS_fork }, /* 2 */
        { 3,    0,      sys_read,               "read", SYS_read }, /* 3 */

diff --git a/linux/mips/syscallent.h b/linux/mips/syscallent.h
index faabfa4481febe2e91553f0042235ced08b8dc42..bd1dc1330aef423b867c1e80eebe2408feb4ffd9 100644 (file)
--- a/linux/mips/syscallent.h
+++ b/linux/mips/syscallent.h
@@ -4251,7 +4251,7 @@
        { 3,    TD,     sys_epoll_wait,         "epoll_wait"    }, /* 4250 */
        { 5,    0,      sys_remap_file_pages,   "remap_file_pages"}, /* 4251 */
        { 1,    0,      printargs,              "set_tid_address"}, /* 4252 */
-       { 0,    0,      printargs,              "restart_syscall"}, /* 4253 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"}, /* 4253 */
        { 7,    0,      sys_fadvise64_64,       "fadvise64_64"  }, /* 4254 */
        { 3,    TF,     sys_statfs64,           "statfs64"      }, /* 4255 */
        { 2,    TD,     sys_fstatfs64,          "fstatfs64"     }, /* 4256 */

diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index 4a31aff05656e980f1c7c2a93a1051374cfe96f9..e57e4e04f3e4972d6472037efe86f829334b8f63 100644 (file)
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -28,7 +28,7 @@
  *     $Id$
  */
 
-       { 5,    0,      printargs,              "SYS_0"                 }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"       }, /* 0 */
        { 1,    TP,     sys_exit,               "exit"                  }, /* 1 */
        { 0,    TP,     sys_fork,               "fork"                  }, /* 2 */
        { 3,    TD,     sys_read,               "read"                  }, /* 3 */

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index a5acd4edb5d86737f9d47249c4425576c8cb5f3f..b820e4aae0cee494f5f2f561d0027f61aec23185 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -30,7 +30,7 @@
  *     $Id$
  */
 
-       { 0,    0,      sys_setup,              "setup"         }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"}, /* 0 */
        { 1,    TP,     sys_exit,               "_exit"         }, /* 1 */
        { 0,    TP,     sys_fork,               "fork"          }, /* 2 */
        { 3,    TD,     sys_read,               "read"          }, /* 3 */

diff --git a/linux/sparc/syscall.h b/linux/sparc/syscall.h
index b4eb5d26fa9553605dc034a10aa6741694bf9faa..a21f9ff829821437a2465df13916f9597cfaf88b 100644 (file)
--- a/linux/sparc/syscall.h
+++ b/linux/sparc/syscall.h
@@ -29,6 +29,7 @@
  */
 #include "dummy.h"
 
+int    sys_restart_syscall();
 int    sys_nosys();
 int    sys_nullsys();
 int    sys_errsys();

diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index 84b3d952614f6eae3a813d4726d01aa8e953f3b3..712cca9bd50483619205a33b61cc1e877f5beb31 100644 (file)
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -1,4 +1,4 @@
-       { 1,    0,      sys_setup,      "setup" },              /* 0 */
+       { 01,   0,      sys_restart_syscall,"restart_syscall" },/* 0 */
        { 1,    TP,     sys_exit,       "exit" },               /* 1 */
        { 0,    TP,     sys_fork,       "fork" },               /* 2 */
        { 3,    TD,     sys_read,       "read" },               /* 3 */

diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index 84b3d952614f6eae3a813d4726d01aa8e953f3b3..5b14c0c22a66722a05439e9232ff4b6e823200e7 100644 (file)
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -1,4 +1,4 @@
-       { 1,    0,      sys_setup,      "setup" },              /* 0 */
+       { 0,    0,      sys_restart_syscall, "restart_syscall" },/* 0 */
        { 1,    TP,     sys_exit,       "exit" },               /* 1 */
        { 0,    TP,     sys_fork,       "fork" },               /* 2 */
        { 3,    TD,     sys_read,       "read" },               /* 3 */

diff --git a/linux/syscall.h b/linux/syscall.h
index 22977e60e7fe6b5fed1b81b5bf5e46e653eb0fea..24331fedcb57bcdc8fa1d95f26d651be268e3f76 100644 (file)
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -32,6 +32,7 @@
 
 /* primary syscalls */
 
+int sys_restart_syscall();
 int sys_setup(), sys_exit(), sys_fork(), sys_read(), sys_write();
 int sys_open(), sys_close(), sys_waitpid(), sys_creat(), sys_link();
 int sys_unlink(), sys_execve(), sys_chdir(), sys_time(), sys_mknod();

diff --git a/linux/syscallent.h b/linux/syscallent.h
index 8aa750b8d6670bce318f4a57adb526178bd2f831..b982f283fd71cedcd51d5e5858f85f260d64dbb0 100644 (file)
--- a/linux/syscallent.h
+++ b/linux/syscallent.h
@@ -28,7 +28,7 @@
  *     $Id$
  */
 
-       { 0,    0,      sys_setup,              "setup"         }, /* 0 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall" }, /* 0 */
        { 1,    TP,     sys_exit,               "_exit", SYS_exit }, /* 1 */
        { 0,    TP,     sys_fork,               "fork", SYS_fork }, /* 2 */
        { 3,    TD,     sys_read,               "read", SYS_read }, /* 3 */

diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h
index 41c17939f1d9bda59d5ee71557e3fc88198ddcde..1172c8af6d6efd1fb0d927cf2bd24c3b9ebca391 100644 (file)
--- a/linux/x86_64/syscallent.h
+++ b/linux/x86_64/syscallent.h
@@ -217,7 +217,7 @@
        { 5,    0,      sys_remap_file_pages,   "remap_file_pages"}, /* 216 */
        { 4,    TD,     sys_getdents64,         "getdents64"    }, /* 217 */
        { 1,    0,      printargs,              "set_tid_address"}, /* 218 */
-       { 5,    0,      printargs,              "restart_syscall"}, /* 219 */
+       { 0,    0,      sys_restart_syscall,    "restart_syscall"}, /* 219 */
        { 5,    TI,     sys_semtimedop,         "semtimedop"    }, /* 220 */
        { 4,    0,      sys_fadvise64_64,       "fadvise64"     }, /* 221 */
        { 3,    0,      sys_timer_create,       "timer_create"  }, /* 222 */

diff --git a/signal.c b/signal.c
index 2df70a0f3f78c0a675ade7c8b8fca7f5980d412f..520562e1bb1ac6c72e1f7c3e57ba777fd53493ea 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -1950,4 +1950,13 @@ int sys_rt_sigtimedwait(tcp)
        return 0;
 };
 
+int
+sys_restart_syscall(tcp)
+struct tcb *tcp;
+{
+       if (entering(tcp))
+               tprintf("<... resuming interrupted call ...>");
+       return 0;
+}
+
 #endif /* LINUX */