summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/machdep.c3
-rw-r--r--sys/arch/amd64/amd64/machdep.c3
-rw-r--r--sys/arch/armish/armish/armish_machdep.c5
-rw-r--r--sys/arch/armv7/armv7/armv7_machdep.c4
-rw-r--r--sys/arch/aviion/aviion/machdep.c3
-rw-r--r--sys/arch/hppa/hppa/machdep.c3
-rw-r--r--sys/arch/hppa64/hppa64/machdep.c3
-rw-r--r--sys/arch/i386/i386/machdep.c3
-rw-r--r--sys/arch/landisk/landisk/machdep.c3
-rw-r--r--sys/arch/loongson/loongson/machdep.c3
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c3
-rw-r--r--sys/arch/macppc/macppc/machdep.c3
-rw-r--r--sys/arch/octeon/octeon/machdep.c3
-rw-r--r--sys/arch/sgi/sgi/machdep.c3
-rw-r--r--sys/arch/socppc/socppc/machdep.c3
-rw-r--r--sys/arch/solbourne/solbourne/machdep.c3
-rw-r--r--sys/arch/sparc/sparc/machdep.c3
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c5
-rw-r--r--sys/arch/vax/vax/machdep.c3
-rw-r--r--sys/arch/zaurus/zaurus/zaurus_machdep.c5
20 files changed, 23 insertions, 44 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 2a81b749f3c..97845d63139 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.166 2014/11/16 12:30:52 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.167 2014/12/10 15:29:52 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -1028,7 +1028,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
#ifdef BOOTKEY
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 98edbd6f045..48805a7d714 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.200 2014/12/08 07:12:37 mlarkin Exp $ */
+/* $OpenBSD: machdep.c,v 1.201 2014/12/10 15:29:52 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@@ -759,7 +759,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
#ifdef MULTIPROCESSOR
diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c
index 8438934a106..b5d4978e237 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.34 2014/12/03 20:09:32 krw Exp $ */
+/* $OpenBSD: armish_machdep.c,v 1.35 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -272,9 +272,8 @@ boot(int howto)
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* Make sure IRQ's are disabled */
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index ac0cd6eb6bb..bfd9a84a5d7 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.16 2014/11/16 12:30:56 deraadt Exp $ */
+/* $OpenBSD: armv7_machdep.c,v 1.17 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -251,7 +251,6 @@ boot(int howto)
#endif
if (cold) {
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & (RB_HALT | RB_USERREQ)) != RB_USERREQ) {
printf("The operating system has halted.\n");
@@ -288,7 +287,6 @@ boot(int howto)
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* Make sure IRQ's are disabled */
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index 4073c657285..c2dd086a65c 100644
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.72 2014/09/20 09:28:24 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.73 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 2007 Miodrag Vallat.
*
@@ -323,7 +323,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 0217d9e4823..e80132b3091 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.239 2014/10/25 17:31:26 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.240 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 1999-2003 Michael Shalayeff
@@ -920,7 +920,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
#ifdef MULTIPROCESSOR
diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index c4dbdba4c45..a7fc998040b 100644
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.75 2014/10/25 17:31:26 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.76 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -569,7 +569,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* in case we came on powerfail interrupt */
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index b529322ff74..e3a72ca98e3 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.559 2014/12/03 20:09:32 krw Exp $ */
+/* $OpenBSD: machdep.c,v 1.560 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2590,7 +2590,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
#ifdef MULTIPROCESSOR
diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index 83387eaf70b..65aaf9f37de 100644
--- a/sys/arch/landisk/landisk/machdep.c
+++ b/sys/arch/landisk/landisk/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.41 2014/09/20 09:28:24 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.42 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -219,7 +219,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_POWERDOWN) != 0) {
diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index 20be42d5561..c1b99e72467 100644
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.60 2014/09/26 14:32:07 jsing Exp $ */
+/* $OpenBSD: machdep.c,v 1.61 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -932,7 +932,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
pci_dopm = 0;
config_suspend_all(DVACT_POWERDOWN);
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 941674fbc9a..3d6c42c8753 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.113 2014/10/05 02:12:19 aoyama Exp $ */
+/* $OpenBSD: machdep.c,v 1.114 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -480,7 +480,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* LUNA-88K supports automatic powerdown */
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 5bbfc22d38f..15b18cd6f94 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.164 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.165 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -833,7 +833,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 2d89462c335..0ad59525258 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.62 2014/09/20 09:28:24 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.63 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -695,7 +695,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 6cd7ea371df..bd67676657f 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.149 2014/09/20 09:28:24 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.150 2014/12/10 15:29:53 mikeb Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -859,7 +859,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c
index 0017be81f79..2edb7167d7e 100644
--- a/sys/arch/socppc/socppc/machdep.c
+++ b/sys/arch/socppc/socppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.59 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.60 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -1057,7 +1057,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index 416c76d0315..b996b9b0e2d 100644
--- a/sys/arch/solbourne/solbourne/machdep.c
+++ b/sys/arch/solbourne/solbourne/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.44 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.45 2014/12/10 15:29:53 mikeb Exp $ */
/* OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp */
/*
@@ -548,7 +548,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0 || (howto & RB_POWERDOWN) != 0) {
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 40a19b746f7..fce1a81af17 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.166 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.167 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -556,7 +556,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0 || (howto & RB_POWERDOWN) != 0) {
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index ba74694247a..6cea43351cd 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.171 2014/11/16 12:30:59 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.172 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -654,7 +654,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* If powerdown was requested, do it. */
@@ -686,7 +685,7 @@ haltsys:
i = 1;
str[0] = '\0';
}
-
+
if ((howto & RB_SINGLE) != 0)
str[i++] = 's';
if ((howto & RB_KDB) != 0)
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index f1655eb80a1..649b6e7bf68 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.145 2014/11/18 20:51:01 krw Exp $ */
+/* $OpenBSD: machdep.c,v 1.146 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -535,7 +535,6 @@ boot(int howto)
dumpsys();
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
if ((howto & RB_HALT) != 0) {
diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index cf352ca1375..a68839cd466 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.54 2014/12/03 20:09:32 krw Exp $ */
+/* $OpenBSD: zaurus_machdep.c,v 1.55 2014/12/10 15:29:53 mikeb Exp $ */
/* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
/*
@@ -320,9 +320,8 @@ boot(int howto)
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
dumpsys();
-
+
haltsys:
- doshutdownhooks();
config_suspend_all(DVACT_POWERDOWN);
/* Make sure IRQ's are disabled */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 19:43:39 +0000