about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-05 07:05:40 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-05 07:05:40 +0000
commit00e58701f31f8628106948aa6486487ed89ece52 (patch)
treec2863d340412486d844030b6586bf719fc24400b /sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c
parentb74121ae4bc5fcedd4872353dac3af07b5e7eb0f (diff)
downloadglibc-00e58701f31f8628106948aa6486487ed89ece52.tar.gz
glibc-00e58701f31f8628106948aa6486487ed89ece52.tar.xz
glibc-00e58701f31f8628106948aa6486487ed89ece52.zip
Update.
2003-01-05  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/socket.S: Add support for
	cancellation handling.
	* sysdeps/unix/sysv/linux/s390/s390-64/socket.S: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c: Likewise.

2003-01-04  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/system.c (cancel_handler): Correct
	order of parameters passed to kill.

	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Add nanosecond fields.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c')
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c b/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c
index 4fa30ec3c8..f5e8de3160 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <sysdep.h>
+#include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
 extern int __syscall_rt_sigsuspend (const sigset_t *, size_t);
@@ -34,7 +34,16 @@ __sigsuspend (set)
 {
   /* XXX The size argument hopefully will have to be changed to the
      real size of the user-level sigset_t.  */
-  return INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8);
+  if (SINGLE_THREAD_P)
+    return INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8);
+
+  int oldtype = LIBC_CANCEL_ASYNC ();
+
+  int result = INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8);
+
+  LIBC_CANCEL_RESET (oldtype);
+
+  return result;
 }
 libc_hidden_def (__sigsuspend)
 weak_alias (__sigsuspend, sigsuspend)