summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/alpha/machdep.c7
-rw-r--r--sys/arch/amd64/amd64/machdep.c4
-rw-r--r--sys/arch/armish/armish/armish_machdep.c4
-rw-r--r--sys/arch/armv7/armv7/armv7_machdep.c4
-rw-r--r--sys/arch/aviion/aviion/machdep.c5
-rw-r--r--sys/arch/hppa/hppa/machdep.c4
-rw-r--r--sys/arch/hppa64/hppa64/machdep.c4
-rw-r--r--sys/arch/i386/i386/machdep.c4
-rw-r--r--sys/arch/landisk/landisk/machdep.c4
-rw-r--r--sys/arch/loongson/loongson/machdep.c4
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c5
-rw-r--r--sys/arch/macppc/macppc/machdep.c4
-rw-r--r--sys/arch/octeon/octeon/machdep.c4
-rw-r--r--sys/arch/sgi/sgi/machdep.c4
-rw-r--r--sys/arch/socppc/socppc/machdep.c4
-rw-r--r--sys/arch/solbourne/solbourne/machdep.c7
-rw-r--r--sys/arch/sparc/sparc/machdep.c7
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c7
-rw-r--r--sys/arch/vax/vax/machdep.c7
-rw-r--r--sys/arch/zaurus/zaurus/zaurus_machdep.c4
-rw-r--r--sys/sys/reboot.h12
21 files changed, 54 insertions, 55 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 2389032289a..b198b99d780 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.156 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.157 2014/07/10 12:13:48 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -974,9 +974,8 @@ skipMHz:
int waittime = -1;
struct pcb dumppcb;
-void
-boot(howto)
- int howto;
+__dead void
+boot(int howto)
{
struct device *mainbus;
#if defined(MULTIPROCESSOR)
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 77c1a645824..4e14080b0c1 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.180 2014/06/15 11:43:24 sf Exp $ */
+/* $OpenBSD: machdep.c,v 1.181 2014/07/10 12:13:48 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@@ -742,7 +742,7 @@ cpu_unidle(struct cpu_info *ci)
int waittime = -1;
struct pcb dumppcb;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c
index 6d03ae132b4..db45f57b52f 100644
--- a/sys/arch/armish/armish/armish_machdep.c
+++ b/sys/arch/armish/armish/armish_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: armish_machdep.c,v 1.25 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: armish_machdep.c,v 1.26 2014/07/10 12:13:48 uebayasi Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -246,7 +246,7 @@ int comcnmode = CONMODE;
*/
void board_reset(void);
void board_powerdown(void);
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index 98afd024d1f..b429fa6c64a 100644
--- a/sys/arch/armv7/armv7/armv7_machdep.c
+++ b/sys/arch/armv7/armv7/armv7_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7_machdep.c,v 1.8 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: armv7_machdep.c,v 1.9 2014/07/10 12:13:48 uebayasi Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -242,7 +242,7 @@ int comcnmode = CONMODE;
* Deal with any syncing, unmounting, dumping and shutdown hooks,
* then reset the CPU.
*/
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index 86e6dac20aa..cd70d811b5a 100644
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.64 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.65 2014/07/10 12:13:48 uebayasi Exp $ */
/*
* Copyright (c) 2007 Miodrag Vallat.
*
@@ -292,8 +292,7 @@ doboot()
}
__dead void
-boot(howto)
- int howto;
+boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 6dab4a60915..0d79161c1af 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.222 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.223 2014/07/10 12:13:48 uebayasi Exp $ */
/*
* Copyright (c) 1999-2003 Michael Shalayeff
@@ -886,7 +886,7 @@ btlb_insert(pa_space_t space, vaddr_t va, paddr_t pa, vsize_t *lenp, u_int prot)
int waittime = -1;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index 7987ff63a47..e2a0d1139a0 100644
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.60 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.61 2014/07/10 12:13:49 uebayasi Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -532,7 +532,7 @@ ptlball(void)
int waittime = -1;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 59f08fa2f7b..a6da0388774 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.541 2014/07/04 09:48:38 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.542 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2554,7 +2554,7 @@ cpu_unidle(struct cpu_info *ci)
int waittime = -1;
struct pcb dumppcb;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index 02dbdee955b..e61894ff390 100644
--- a/sys/arch/landisk/landisk/machdep.c
+++ b/sys/arch/landisk/landisk/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.33 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.34 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -190,7 +190,7 @@ landisk_startup(int howto, char *_esym)
for (;;) ;
}
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 87b709832c3..8e63720007a 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.49 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.50 2014/07/10 12:13:49 uebayasi Exp $ */
/*
* Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -899,7 +899,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
int waittime = -1;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 2ac7ef379bd..cc1b9085671 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.100 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.101 2014/07/10 12:13:49 uebayasi Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -466,8 +466,7 @@ cpu_startup()
}
__dead void
-boot(howto)
- int howto;
+boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 99d6462720f..82d2c9c82d6 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.153 2014/07/09 08:34:01 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.154 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -800,7 +800,7 @@ lcsplx(int ipl)
/*
* Halt or reboot the machine after syncing/dumping according to howto.
*/
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 65daf78179e..784332c5b46 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.49 2014/06/17 01:33:04 jmatthew Exp $ */
+/* $OpenBSD: machdep.c,v 1.50 2014/07/10 12:13:49 uebayasi Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -663,7 +663,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
int waittime = -1;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 08bdbb12024..5ed7682b63c 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.140 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.141 2014/07/10 12:13:49 uebayasi Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -826,7 +826,7 @@ sgi_cpuspeed(int *freq)
int waittime = -1;
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c
index 2d52a1d19d8..a9dc40f3956 100644
--- a/sys/arch/socppc/socppc/machdep.c
+++ b/sys/arch/socppc/socppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.48 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.49 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -1028,7 +1028,7 @@ reserve_dumppages(caddr_t p)
/*
* Halt or reboot the machine after syncing/dumping according to howto.
*/
-void
+__dead void
boot(int howto)
{
static int syncing;
diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index e8be76b61c4..6a4883aa7d9 100644
--- a/sys/arch/solbourne/solbourne/machdep.c
+++ b/sys/arch/solbourne/solbourne/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.33 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.34 2014/07/10 12:13:49 uebayasi Exp $ */
/* OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp */
/*
@@ -513,9 +513,8 @@ sys_sigreturn(p, v, retval)
int waittime = -1;
-void
-boot(howto)
- int howto;
+__dead void
+boot(int howto)
{
int i;
static char str[4]; /* room for "-sd\0" */
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index b6148d6a6fe..e0e25fecc45 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.154 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.155 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -522,9 +522,8 @@ sys_sigreturn(p, v, retval)
int waittime = -1;
-void
-boot(howto)
- int howto;
+__dead void
+boot(int howto)
{
int i;
static char str[4]; /* room for "-sd\0" */
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index f3223097cbd..38fc758eef5 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.157 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.158 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -604,9 +604,8 @@ signotify(struct proc *p)
int waittime = -1;
struct pcb dumppcb;
-void
-boot(howto)
- int howto;
+__dead void
+boot(int howto)
{
int i;
static char str[128];
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 3ec08818fe6..256205ad1d0 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.136 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.137 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -508,9 +508,8 @@ sendsig(catcher, sig, mask, code, type, val)
int waittime = -1;
static volatile int showto; /* Must be volatile to survive MM on -> MM off */
-void
-boot(howto)
- register int howto;
+__dead void
+boot(int howto)
{
struct device *mainbus;
diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index 313080d2e56..44768babd94 100644
--- a/sys/arch/zaurus/zaurus/zaurus_machdep.c
+++ b/sys/arch/zaurus/zaurus/zaurus_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zaurus_machdep.c,v 1.44 2014/05/31 15:49:28 mpi Exp $ */
+/* $OpenBSD: zaurus_machdep.c,v 1.45 2014/07/10 12:13:49 uebayasi Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -286,7 +286,7 @@ int comcnmode = CONMODE;
* Deal with any syncing, unmounting, dumping and shutdown hooks,
* then reset the CPU.
*/
-void
+__dead void
boot(int howto)
{
struct device *mainbus;
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 34f383c533d..23d6db7d2bc 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reboot.h,v 1.14 2013/03/24 17:42:43 deraadt Exp $ */
+/* $OpenBSD: reboot.h,v 1.15 2014/07/10 12:13:48 uebayasi Exp $ */
/* $NetBSD: reboot.h,v 1.9 1996/04/22 01:23:25 christos Exp $ */
/*
@@ -32,6 +32,11 @@
* @(#)reboot.h 8.2 (Berkeley) 7/10/94
*/
+#ifndef _SYS_REBOOT_H_
+#define _SYS_REBOOT_H_
+
+#include <sys/cdefs.h>
+
/*
* Arguments to reboot system call. These are passed to the boot program,
* and then on to init.
@@ -93,8 +98,9 @@
#if defined(_KERNEL) && !defined(_STANDALONE) && !defined(_LOCORE)
__BEGIN_DECLS
-void boot(int)
- __attribute__((__noreturn__));
+__dead void boot(int);
__END_DECLS
#endif /* _KERNEL */
+
+#endif /* !_SYS_REBOOT_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 23:20:32 +0000