Module Name: src
Committed By: rkujawa
Date: Mon Jan 28 16:36:10 UTC 2013
Modified Files:
src/sys/arch/amiga/amiga: machdep.c
Log Message:
Power down only if RB_POWERDOWN. Noticed by phx@ .
To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/arch/amiga/amiga/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.240 src/sys/arch/amiga/amiga/machdep.c:1.241
--- src/sys/arch/amiga/amiga/machdep.c:1.240 Mon Jan 28 14:53:33 2013
+++ src/sys/arch/amiga/amiga/machdep.c Mon Jan 28 16:36:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.240 2013/01/28 14:53:33 rkujawa Exp $ */
+/* $NetBSD: machdep.c,v 1.241 2013/01/28 16:36:10 rkujawa Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
#include "empm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.240 2013/01/28 14:53:33 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.241 2013/01/28 16:36:10 rkujawa Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -430,14 +430,16 @@ cpu_reboot(register int howto, char *boo
if (howto & RB_DUMP)
dumpsys();
- if (howto & RB_HALT) {
#if NEMPM > 0
+ if (howto & RB_POWERDOWN) {
empmdev = device_find_by_xname("empm0");
if (empmdev != NULL) {
empm_power_off(device_private(empmdev));
}
+ }
#endif /* NEMPM > 0 */
+ if (howto & RB_HALT) {
printf("\n");
printf("The operating system has halted.\n");
printf("Please press any key to reboot.\n\n");
