Do not expose the trap T_* values to userland, since they invade the

namespace a bit much.  These are the names for the value encoded in
core.c_ucode or siginfo.si_trapno, but userland never looks directly
and only cares about the abstract signal code.
ok guenther

7 files changed, 14 insertions, 17 deletions

diff --git a/sys/arch/amd64/include/signal.h b/sys/arch/amd64/include/signal.h
index f1f310048d2..527a220cf32 100644
--- a/sys/arch/amd64/include/signal.h
+++ b/sys/arch/amd64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.7 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.8 2013/04/01 17:18:19 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 
 typedef int sig_atomic_t;
 
-#if __BSD_VISIBLE
+#ifdef _KERNEL
 #include <machine/trap.h>
 #endif
 
diff --git a/sys/arch/hppa/include/signal.h b/sys/arch/hppa/include/signal.h
index 80beef1253e..629a9410d58 100644
--- a/sys/arch/hppa/include/signal.h
+++ b/sys/arch/hppa/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.10 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.11 2013/04/01 17:18:20 deraadt Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -34,7 +34,7 @@
 
 typedef int sig_atomic_t;
 
-#if __BSD_VISIBLE
+#ifdef _KERNEL
 #include <machine/trap.h>
 #endif
 
diff --git a/sys/arch/hppa64/include/signal.h b/sys/arch/hppa64/include/signal.h
index d2e8d316eb8..31498706cef 100644
--- a/sys/arch/hppa64/include/signal.h
+++ b/sys/arch/hppa64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2013/04/01 17:18:20 deraadt Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -34,7 +34,7 @@
 
 typedef int sig_atomic_t;
 
-#if __BSD_VISIBLE
+#ifdef _KERNEL
 #include <machine/trap.h>
 #endif
 
diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h
index 660f7723b83..790339eb264 100644
--- a/sys/arch/i386/include/signal.h
+++ b/sys/arch/i386/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.9 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.10 2013/04/01 17:18:20 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.6 1996/01/08 13:51:43 mycroft Exp $	*/
 
 /*
@@ -39,10 +39,7 @@
 
 typedef int sig_atomic_t;
 
-#if __BSD_VISIBLE
-/*
- * Get the "code" values
- */
+#ifdef _KERNEL
 #include <machine/trap.h>
 #endif
 
diff --git a/sys/arch/m68k/include/signal.h b/sys/arch/m68k/include/signal.h
index 9115367cfcb..b0cc07c865e 100644
--- a/sys/arch/m68k/include/signal.h
+++ b/sys/arch/m68k/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.6 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.7 2013/04/01 17:18:20 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.4 1995/01/10 19:01:31 jtc Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 
 typedef int sig_atomic_t;
 
-#if __BSD_VISIBLE
+#ifdef _KERNEL
 /*
  * Get the "code" values
  */
diff --git a/sys/arch/sparc/include/signal.h b/sys/arch/sparc/include/signal.h
index 046c44d59dd..2c50cd06314 100644
--- a/sys/arch/sparc/include/signal.h
+++ b/sys/arch/sparc/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.10 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.11 2013/04/01 17:18:20 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.4 1996/02/01 22:32:35 mycroft Exp $ */
 
 /*
@@ -78,7 +78,7 @@ struct sigcontext {
 #define	SC_O0_OFFSET	28
 #endif /* _LOCORE */
 
-#if defined(_LOCORE) || __BSD_VISIBLE
+#if defined(_LOCORE) || defined(_KERNEL)
 /*
  * `Code' arguments to signal handlers.  The names, and the funny numbering.
  * are defined so as to match up with what SunOS uses; I have no idea why
diff --git a/sys/arch/sparc64/include/signal.h b/sys/arch/sparc64/include/signal.h
index 0333dc1b733..b5a2122f72e 100644
--- a/sys/arch/sparc64/include/signal.h
+++ b/sys/arch/sparc64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.10 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.11 2013/04/01 17:18:20 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.10 2001/05/09 19:50:49 kleink Exp $ */
 
 /*
@@ -72,7 +72,7 @@ struct sigcontext {
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
 #endif /* _LOCORE */
 
-#if defined(_LOCORE) || __BSD_VISIBLE
+#if defined(_LOCORE) || defined(_KERNEL)
 /*
  * `Code' arguments to signal handlers.  The names, and the funny numbering.
  * are defined so as to match up with what SunOS uses; I have no idea why