Mercurial > illumos > illumos-gate
changeset 13548:c7b36cdbb672
1627 nightly build panics, assertion failed: pg_cpu_is_bootstrapped(cpu), cmt.c line:451
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Thu, 15 Dec 2011 21:12:46 -0500 |
| parents | 7d365d7822b1 |
| children | 4bc299bbc356 |
| files | usr/src/uts/common/disp/cmt.c |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/disp/cmt.c Fri Dec 16 20:10:44 2011 -0500 +++ b/usr/src/uts/common/disp/cmt.c Thu Dec 15 21:12:46 2011 -0500 @@ -1263,6 +1263,9 @@ ASSERT(PGHW_IS_PM_DOMAIN(type)); ASSERT(MUTEX_HELD(&cpu_lock)); + if (cmt_sched_disabled == 1) + return (-1); + if ((hwset = pghw_set_lookup(type)) == NULL || cmt_hw_blacklisted[type]) { /* @@ -1313,6 +1316,9 @@ ASSERT(PGHW_IS_PM_DOMAIN(type)); ASSERT(MUTEX_HELD(&cpu_lock)); + if (cmt_sched_disabled == 1) + return (-1); + if ((hwset = pghw_set_lookup(type)) == NULL) { /* * Unable to find any instances of the specified type of