Module Name: src
Committed By: jmcneill
Date: Sun Aug 28 21:31:41 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: cpu.c
Log Message:
cpu_reboot: only call thunk_abort if RB_DUMP is set
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/usermode/dev/cpu.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/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.21 src/sys/arch/usermode/dev/cpu.c:1.22
--- src/sys/arch/usermode/dev/cpu.c:1.21 Sun Aug 28 19:41:34 2011
+++ src/sys/arch/usermode/dev/cpu.c Sun Aug 28 21:31:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.21 2011/08/28 19:41:34 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_cpu.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2011/08/28 19:41:34 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -116,6 +116,9 @@
if ((howto & RB_POWERDOWN) == RB_POWERDOWN)
thunk_exit(0);
+ if (howto & RB_DUMP)
+ thunk_abort();
+
if (howto & RB_HALT) {
printf("\n");
printf("The operating system has halted.\n");
@@ -127,10 +130,6 @@
printf("rebooting...\n");
-#if defined(DIAGNOSTIC) || defined(DEBUG)
- thunk_abort();
-#endif
-
usermode_reboot();
/* NOTREACHED */
