From 24382fa41f454f0306cd081be28ec2538eec30bf Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 15 Aug 1998 22:29:43 +0000
Subject: [PATCH] Oops, the previous fix confused Linux's sigset_t with a
 pointer type. It can be integral or a struct in POSIX, so it is difficult to
 print, but it is actually declared as unsigned long.  Assume that it is
 unsigned integral.

---
 sys/compat/linux/linux_signal.c | 10 +++++-----
 sys/i386/linux/linux_signal.c   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index f901dff3d86e..b2cb996e56a9 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.10 1997/11/06 19:29:00 phk Exp $
+ *  $Id: linux_signal.c,v 1.11 1998/07/29 16:43:00 bde Exp $
  */
 
 #include <sys/param.h>
@@ -241,8 +241,8 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args)
     sigset_t mask;
 
 #ifdef DEBUG
-    printf("Linux-emul(%ld): sigsetmask(%p)\n",
-	(long)p->p_pid, (void *)args->mask);
+    printf("Linux-emul(%ld): sigsetmask(%08lx)\n",
+	(long)p->p_pid, (unsigned long)args->mask);
 #endif
     p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask);
 
@@ -276,8 +276,8 @@ linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args)
     struct sigsuspend_args tmp;
 
 #ifdef DEBUG
-    printf("Linux-emul(%ld): sigsuspend(%p)\n",
-	(long)p->p_pid, (void *)args->mask);
+    printf("Linux-emul(%ld): sigsuspend(%08lx)\n",
+	(long)p->p_pid, (unsigned long)args->mask);
 #endif
     tmp.mask = linux_to_bsd_sigset(args->mask);
     return sigsuspend(p, &tmp);
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index f901dff3d86e..b2cb996e56a9 100644
--- a/sys/i386/linux/linux_signal.c
+++ b/sys/i386/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.10 1997/11/06 19:29:00 phk Exp $
+ *  $Id: linux_signal.c,v 1.11 1998/07/29 16:43:00 bde Exp $
  */
 
 #include <sys/param.h>
@@ -241,8 +241,8 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args)
     sigset_t mask;
 
 #ifdef DEBUG
-    printf("Linux-emul(%ld): sigsetmask(%p)\n",
-	(long)p->p_pid, (void *)args->mask);
+    printf("Linux-emul(%ld): sigsetmask(%08lx)\n",
+	(long)p->p_pid, (unsigned long)args->mask);
 #endif
     p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask);
 
@@ -276,8 +276,8 @@ linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args)
     struct sigsuspend_args tmp;
 
 #ifdef DEBUG
-    printf("Linux-emul(%ld): sigsuspend(%p)\n",
-	(long)p->p_pid, (void *)args->mask);
+    printf("Linux-emul(%ld): sigsuspend(%08lx)\n",
+	(long)p->p_pid, (unsigned long)args->mask);
 #endif
     tmp.mask = linux_to_bsd_sigset(args->mask);
     return sigsuspend(p, &tmp);