summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorgirish <none@none>2005-07-25 16:54:29 -0700
committergirish <none@none>2005-07-25 16:54:29 -0700
commitdf59106d5526f91fcce02ae3d3ae741095584fd7 (patch)
tree36b8c314e89205221fdde29cb19b240610c8400c /usr/src
parentbcbe91555f717d9e65cf05794295dfe172334908 (diff)
downloadillumos-joyent-df59106d5526f91fcce02ae3d3ae741095584fd7.tar.gz
6289017 sun4v system hangs during the boot
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/sun4v/os/mach_startup.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/sun4v/os/mach_startup.c b/usr/src/uts/sun4v/os/mach_startup.c
index 77ee84cda6..64a2dfcaa6 100644
--- a/usr/src/uts/sun4v/os/mach_startup.c
+++ b/usr/src/uts/sun4v/os/mach_startup.c
@@ -80,7 +80,7 @@ cpu_halt(void)
processorid_t cpun = cpup->cpu_id;
cpupart_t *cp;
int hset_update = 1;
- int s;
+ uint_t s;
/*
* If this CPU is online, and there's multiple CPUs
@@ -93,11 +93,11 @@ cpu_halt(void)
hset_update = 0;
/*
* We're on our way to being halted.
- * Raise PIL now, so that we'll awaken immediately
+ * Disable interrupts now, so that we'll awaken immediately
* after halting if someone tries to poke us between now and
* the time we actually halt.
*/
- s = spl7();
+ s = disable_vec_intr();
/*
* Add ourselves to the partition's halted CPUs bitmask
@@ -118,7 +118,7 @@ cpu_halt(void)
if (disp_anywork()) {
if (hset_update)
CPUSET_ATOMIC_DEL(cp->cp_haltset, cpun);
- (void) splx(s);
+ enable_vec_intr(s);
return;
}
@@ -130,7 +130,7 @@ cpu_halt(void)
/*
* We're no longer halted
*/
- (void) splx(s);
+ enable_vec_intr(s);
if (hset_update)
CPUSET_ATOMIC_DEL(cp->cp_haltset, cpun);
}