diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/machdep.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 11793d2b592..7fd8c6e19d6 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.234 2014/08/18 05:11:03 dlg Exp $ */ +/* $OpenBSD: machdep.c,v 1.235 2014/09/19 18:21:14 kettenis Exp $ */ /* * Copyright (c) 1999-2003 Michael Shalayeff @@ -889,8 +889,6 @@ int waittime = -1; __dead void boot(int howto) { - struct device *mainbus; - /* * On older systems without software power control, prevent mi code * from spinning disks off, in case the operator changes his mind @@ -929,9 +927,7 @@ boot(int howto) haltsys: doshutdownhooks(); - mainbus = device_mainbus(); - if (mainbus != NULL) - config_suspend(mainbus, DVACT_POWERDOWN); + config_suspend_all(DVACT_POWERDOWN); #ifdef MULTIPROCESSOR hppa_ipi_broadcast(HPPA_IPI_HALT); diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c index 79a7d228c4a..7eb043828ec 100644 --- a/sys/arch/hppa64/hppa64/machdep.c +++ b/sys/arch/hppa64/hppa64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.72 2014/08/18 05:11:03 dlg Exp $ */ +/* $OpenBSD: machdep.c,v 1.73 2014/09/19 18:21:14 kettenis Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -535,8 +535,6 @@ int waittime = -1; __dead void boot(int howto) { - struct device *mainbus; - /* * On older systems without software power control, prevent mi code * from spinning disks off, in case the operator changes his mind @@ -575,9 +573,7 @@ boot(int howto) haltsys: doshutdownhooks(); - mainbus = device_mainbus(); - if (mainbus != NULL) - config_suspend(mainbus, DVACT_POWERDOWN); + config_suspend_all(DVACT_POWERDOWN); /* in case we came on powerfail interrupt */ if (cold_hook) |