diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/os/brand.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/uts/common/os/brand.c b/usr/src/uts/common/os/brand.c index 74840c3039..285828236c 100644 --- a/usr/src/uts/common/os/brand.c +++ b/usr/src/uts/common/os/brand.c @@ -80,7 +80,8 @@ static kmutex_t brand_list_lock; void brand_init() { - brand_plat_interposition_init(); + if (brand_plat_interposition_init != NULL) + brand_plat_interposition_init(); mutex_init(&brand_list_lock, NULL, MUTEX_DEFAULT, NULL); p0.p_brand = &native_brand; } diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index 7277bf2a20..dbb1849208 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -2989,7 +2989,8 @@ zsched(void *arg) id_t cid; /* enable platform wide brand interposition mechanisms */ - if (ZONE_IS_BRANDED(zone)) { + if (ZONE_IS_BRANDED(zone) && + brand_plat_interposition_enable != NULL) { disable_plat_interposition = B_TRUE; brand_plat_interposition_enable(zone->zone_brand); } @@ -3037,8 +3038,10 @@ zsched(void *arg) zone_status_wait_cpr(zone, ZONE_IS_DYING, "zsched"); /* disable platform wide brand interposition mechanisms */ - if (disable_plat_interposition) + if (disable_plat_interposition && + brand_plat_interposition_disable != NULL) { brand_plat_interposition_disable(zone->zone_brand); + } if (ct) /* |