summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorjm22469 <none@none>2007-10-03 09:57:04 -0700
committerjm22469 <none@none>2007-10-03 09:57:04 -0700
commitcdf9f8c9206117516a14f3c70f86510326c3d5fa (patch)
tree30a2db08a0ae10c92c5abe5fad2fabae49414362 /usr/src
parentf1fa5dcf799749330b7bd6cdee34de6a17ea3fd4 (diff)
downloadillumos-joyent-cdf9f8c9206117516a14f3c70f86510326c3d5fa.tar.gz
6605716 halting the system should not override auto-boot? on the next poweron
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/sun4v/os/mach_cpu_states.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/uts/sun4v/os/mach_cpu_states.c b/usr/src/uts/sun4v/os/mach_cpu_states.c
index ffb234c15e..120bebb599 100644
--- a/usr/src/uts/sun4v/os/mach_cpu_states.c
+++ b/usr/src/uts/sun4v/os/mach_cpu_states.c
@@ -198,15 +198,16 @@ mdboot(int cmd, int fcn, char *bootstr, boolean_t invoke_cb)
break;
}
}
- }
- /*
- * If LDoms is running, we must save the boot string before we
- * enter restricted mode. This is possible only if we are not
- * being called from panic.
- */
- if (domaining_enabled() && invoke_cb)
- store_boot_cmd(bootstr);
+ /*
+ * If LDoms is running, we must save the boot string
+ * before we enter restricted mode. This is possible
+ * only if we are not being called from panic.
+ */
+ if (domaining_enabled() && invoke_cb)
+ store_boot_cmd(bootstr);
+
+ }
/*
* At a high interrupt level we can't: