label_t is the kernel setjmp buffer. It should simply be an array of

the right type, noone will ever fiddle with the internals.
discussed with jsing

11 files changed, 23 insertions, 31 deletions

diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index 6f3d95f214c..c1b5eb62bfc 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2011/09/20 22:02:13 miod Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2011/11/15 17:12:13 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[11];
+	long val[11];
 } label_t;
 #endif
 
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index 512ef180535..02794f2e72b 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.16 2011/11/14 19:43:33 deraadt Exp $	*/
+/*	$OpenBSD: _types.h,v 1.17 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,11 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int	lbl_rp;
-	int	lbl_sp;
-	int	lbl_s[17];
-	int	lbl_ss[1];
-	double	lbl_sf[10];	/* hp800:fr12-fr15, hp700:fr12-fr21 */
+	long	val[19];
 } label_t;
 #endif
 
diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index 22f92107858..8ea6f55a3ee 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2011/11/10 23:15:11 deraadt Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -36,12 +36,8 @@
 #define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
-typedef struct label_t {		/* XXX longs?? */
-	int	lbl_rp;
-	int	lbl_sp;
-	int	lbl_s[17];
-	int	lbl_ss[1];
-	double	lbl_sf[10];	/* hp800:fr12-fr15, hp700:fr12-fr21 */
+typedef struct label_t {
+	long	val[20];
 } label_t;
 #endif
 
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index 7cd81c4a218..1f507392cb0 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -51,7 +51,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[6];
+	long val[6];
 } label_t;
 #endif
 
diff --git a/sys/arch/m68k/include/_types.h b/sys/arch/m68k/include/_types.h
index 8dc53b2ea71..776fe9516b2 100644
--- a/sys/arch/m68k/include/_types.h
+++ b/sys/arch/m68k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[15];			/* consistent with HP-UX */
+	long val[15];			/* consistent with HP-UX */
 } label_t;
 #endif
 
diff --git a/sys/arch/m88k/include/_types.h b/sys/arch/m88k/include/_types.h
index eca53f7e629..9d9b373261d 100644
--- a/sys/arch/m88k/include/_types.h
+++ b/sys/arch/m88k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[19];
+	long val[19];
 } label_t;
 #endif
 
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h
index 0d61a79b77b..42107996609 100644
--- a/sys/arch/mips64/include/_types.h
+++ b/sys/arch/mips64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.10 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.11 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -152,7 +152,7 @@ typedef	void *			__wctype_t;
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	__register_t val[14];
+	long val[14];
 } label_t;
 #endif
 
diff --git a/sys/arch/powerpc/include/_types.h b/sys/arch/powerpc/include/_types.h
index ccba4a48ce0..2aa265e491b 100644
--- a/sys/arch/powerpc/include/_types.h
+++ b/sys/arch/powerpc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.12 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.13 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[25];
+	long val[25];
 } label_t;
 #endif
 
diff --git a/sys/arch/sh/include/_types.h b/sys/arch/sh/include/_types.h
index a690f51bcd8..b00da79615a 100644
--- a/sys/arch/sh/include/_types.h
+++ b/sys/arch/sh/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[9];
+	long val[9];
 } label_t;
 #endif
 
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index 7b5454f27da..90c4c0f338a 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.15 2011/09/27 20:44:50 miod Exp $	*/
+/*	$OpenBSD: _types.h,v 1.16 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[3];
+	long val[3];
 } label_t;
 #endif
 
diff --git a/sys/arch/vax/include/_types.h b/sys/arch/vax/include/_types.h
index c30c99e25f4..51e03bb7961 100644
--- a/sys/arch/vax/include/_types.h
+++ b/sys/arch/vax/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2011/09/15 00:48:24 miod Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2011/11/15 17:12:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 
 #if defined(_KERNEL)
 typedef struct label_t {
-	int val[6];
+	long val[6];
 } label_t;
 #endif