diff options
| author | Rafael Vanoni <rafael.vanoni@oracle.com> | 2010-04-27 09:48:22 -0700 |
|---|---|---|
| committer | Rafael Vanoni <rafael.vanoni@oracle.com> | 2010-04-27 09:48:22 -0700 |
| commit | 90aaf3555d92da01feb564979c25efe106140674 (patch) | |
| tree | 612b10f7d35edbe3f43950d170b66bea0032392e /usr/src/uts/common/os/clock.c | |
| parent | 1ab248cfb5735aa61c02a62dc14be134fc21e354 (diff) | |
| download | illumos-joyent-90aaf3555d92da01feb564979c25efe106140674.tar.gz | |
6947255 early boot panic trips clock.c:2474 ASSERT(nsec_per_tick > 0)
Diffstat (limited to 'usr/src/uts/common/os/clock.c')
| -rw-r--r-- | usr/src/uts/common/os/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/os/clock.c b/usr/src/uts/common/os/clock.c index e1d687236b..4783542d77 100644 --- a/usr/src/uts/common/os/clock.c +++ b/usr/src/uts/common/os/clock.c @@ -2590,7 +2590,8 @@ lbolt_cyclic(void) /* * Switching from cyclic to event driven mode. */ - if (atomic_cas_32(&lb_info->lbi_token, 0, 1) == 0) { + if (panicstr == NULL && + atomic_cas_32(&lb_info->lbi_token, 0, 1) == 0) { if (lbolt_hybrid == lbolt_event_driven) { ret = atomic_dec_32_nv( |