diff options
| author | John Levon <john.levon@joyent.com> | 2019-01-11 18:52:07 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2019-01-14 15:58:08 +0000 |
| commit | f9f91f24e6485d0445061fe4b6f0d256a59a6b37 (patch) | |
| tree | 153312572a4d3308e752d12b1f55683830e76a0f /usr/src/uts | |
| parent | 5ccdba4aff9b02393d7ae33795f4794f4149db3e (diff) | |
| download | illumos-joyent-f9f91f24e6485d0445061fe4b6f0d256a59a6b37.tar.gz | |
OS-7509 OS-7335 upstream causes duplicate allocation lines
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index cf869025bd..ebde0d7850 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2018, Joyent Inc. + * Copyright (c) 2019, Joyent, Inc. * Copyright (c) 2016 by Delphix. All rights reserved. * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ @@ -5203,8 +5203,6 @@ zone_create(const char *zone_name, const char *zone_root, zone->zone_ustate = cpu_uarray_zalloc(ZONE_USTATE_MAX, KM_SLEEP); - zone->zone_ustate = cpu_uarray_zalloc(ZONE_USTATE_MAX, KM_SLEEP); - /* * Zsched initializes the rctls. */ |
