Don't use __dead in the kernel. It was an obfuscation for gcc >= 2.5

and a no-op for gcc >= 2.6.

6 files changed, 17 insertions, 19 deletions

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 0201635..eb9e444 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.37 1996/08/20 07:17:47 smpatel Exp $
+ * $Id: kern_exit.c,v 1.38 1996/08/22 03:50:15 julian Exp $
  */
 
 #include "opt_ktrace.h"
@@ -94,7 +94,7 @@ static ele_p exit_list;
  * exit --
  *	Death of process.
  */
-__dead void
+void
 exit(p, uap, retval)
 	struct proc *p;
 	struct rexit_args /* {
@@ -112,7 +112,7 @@ exit(p, uap, retval)
  * to zombie, and unlink proc from allproc and parent's lists.  Save exit
  * status and rusage for wait().  Check for child processes and orphan them.
  */
-__dead void
+void
 exit1(p, rv)
 	register struct proc *p;
 	int rv;
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 7507740..66daad7 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.5 1996/09/06 23:08:40 phk Exp $
+ * $Id: kern_shutdown.c,v 1.6 1996/09/07 19:13:09 sos Exp $
  */
 
 #include "opt_ddb.h"
@@ -159,7 +159,7 @@ static struct pcb dumppcb;
  * this used to be in machdep.c but I'll be dammned if I could see
  * anything machine dependant in it.
  */
-__dead void
+void
 boot(howto)
 	int howto;
 {
@@ -335,9 +335,6 @@ dumpsys(void)
  * and then reboots.  If we are called twice, then we avoid trying to sync
  * the disks as this often leads to recursive panics.
  */
-#ifdef __GNUC__
-__dead			/* panic() does not return */
-#endif
 void
 panic(const char *fmt, ...)
 {
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index d871d35..924e4ea 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id: makesyscalls.sh,v 1.16 1995/10/07 23:56:18 swallace Exp $
+# $Id: makesyscalls.sh,v 1.17 1996/03/02 19:38:10 peter Exp $
 
 set -e
 
@@ -258,10 +258,11 @@ s/\$//g
 		}
 		if ($2 != "NOPROTO" && (!nosys || funcname != "nosys") && \
 		    (!lkmnosys || funcname != "lkmnosys")) {
-			if (funcname == "exit")
-				printf("__dead ") > sysdcl
-			printf("%s\t%s __P((struct proc *, struct %s *, int []));\n", \
+			printf("%s\t%s __P((struct proc *, struct %s *, int []))", \
 			    rettype, funcname, argalias) > sysdcl
+			if (funcname == "exit")
+				printf(" __dead2") > sysdcl
+			printf(";\n") > sysdcl
 		}
 		if (funcname == "nosys")
 			nosys = 1
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 43c56af..d0313b7 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $Id: proc.h,v 1.26 1996/07/31 09:26:54 davidg Exp $
+ * $Id: proc.h,v 1.27 1996/08/20 07:18:08 smpatel Exp $
  */
 
 #ifndef _SYS_PROC_H_
@@ -305,8 +305,8 @@ void	unsleep __P((struct proc *));
 void	wakeup __P((void *chan));
 void	wakeup_one __P((void *chan));
 
-__dead void cpu_exit __P((struct proc *)) __dead2;
-__dead void exit1 __P((struct proc *, int)) __dead2;
+void	cpu_exit __P((struct proc *)) __dead2;
+void	exit1 __P((struct proc *, int)) __dead2;
 int	cpu_fork __P((struct proc *, struct proc *));
 int	trace_req __P((struct proc *));
 void	cpu_wait __P((struct proc *));
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 6465e8d..4aba14d 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -721,7 +721,7 @@ struct	rfork_args {
 	int flags;
 };
 int	nosys __P((struct proc *, struct nosys_args *, int []));
-__dead void	exit __P((struct proc *, struct rexit_args *, int []));
+void	exit __P((struct proc *, struct rexit_args *, int [])) __dead2;
 int	fork __P((struct proc *, struct fork_args *, int []));
 int	read __P((struct proc *, struct read_args *, int []));
 int	write __P((struct proc *, struct write_args *, int []));
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 199ea46..e628400 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.42 1996/08/22 03:50:33 julian Exp $
+ * $Id: systm.h,v 1.43 1996/08/31 16:57:54 bde Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -115,8 +115,8 @@ int	ureadc __P((int, struct uio *));
 void	*hashinit __P((int count, int type, u_long *hashmask));
 void	*phashinit __P((int count, int type, u_long *nentries));
 
-__dead void	panic __P((const char *, ...)) __dead2;
-__dead void	boot __P((int)) __dead2;
+void	panic __P((const char *, ...)) __dead2;
+void	boot __P((int)) __dead2;
 void	cpu_boot __P((int));
 void	tablefull __P((const char *));
 int	addlog __P((const char *, ...));