diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2012-09-04 14:40:52 -0700 |
|---|---|---|
| committer | Joshua M. Clulow <josh@sysmgr.org> | 2012-09-04 22:48:25 +0000 |
| commit | 25312d162f12740b5d08ac352d44524d33545d4d (patch) | |
| tree | 550f15ff38da97935c5f9c16431f4f7b89b226c0 | |
| parent | 56ee074950d78f67fe7c698ba2ab7099e9fa4eea (diff) | |
| download | illumos-joyent-25312d162f12740b5d08ac352d44524d33545d4d.tar.gz | |
OS-1513 misplaced ASSERT in OS-1247 breaks DEBUG bits
| -rw-r--r-- | usr/src/uts/intel/dtrace/sdt.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/dtrace/sdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/intel/dtrace/sdt.c b/usr/src/uts/intel/dtrace/sdt.c index a0b3cfb48e..27cb19e06c 100644 --- a/usr/src/uts/intel/dtrace/sdt.c +++ b/usr/src/uts/intel/dtrace/sdt.c @@ -428,8 +428,8 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) priv = DTRACE_PRIV_KERNEL; sdt_pops.dtps_mode = NULL; } else { - ASSERT(priv == DTRACE_PRIV_USER); priv = prov->sdtp_priv; + ASSERT(priv == DTRACE_PRIV_USER); sdt_pops.dtps_mode = sdt_mode; } diff --git a/usr/src/uts/sparc/dtrace/sdt.c b/usr/src/uts/sparc/dtrace/sdt.c index bbd2646a10..8fbdf24fee 100644 --- a/usr/src/uts/sparc/dtrace/sdt.c +++ b/usr/src/uts/sparc/dtrace/sdt.c @@ -382,8 +382,8 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) priv = DTRACE_PRIV_KERNEL; sdt_pops.dtps_mode = NULL; } else { - ASSERT(priv == DTRACE_PRIV_USER); priv = prov->sdtp_priv; + ASSERT(priv == DTRACE_PRIV_USER); sdt_pops.dtps_mode = sdt_mode; } |