Module Name: src Committed By: ozaki-r Date: Fri Mar 7 02:37:16 UTC 2014
Modified Files: src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: Fix build of DTrace with GCC 4.8 Use __diagused for a variable which is only referred by KASSERT. Advised by matt@ To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.25 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.26 --- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.25 Wed Mar 5 20:14:15 2014 +++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Fri Mar 7 02:37:16 2014 @@ -16655,7 +16655,7 @@ dtrace_state_worker_add(void (*fn)(dtrac hrtime_t interval) { struct dtrace_state_worker *w; - int error; + int error __diagused; w = kmem_alloc(sizeof(*w), KM_SLEEP); mutex_init(&w->lock, MUTEX_DEFAULT, IPL_NONE); @@ -16666,7 +16666,6 @@ dtrace_state_worker_add(void (*fn)(dtrac w->exiting = false; error = kthread_create(PRI_NONE, KTHREAD_MPSAFE|KTHREAD_MUSTJOIN, NULL, dtrace_state_worker_thread, w, &w->lwp, "dtrace-state-worker"); - (void) error; KASSERT(error == 0); /* XXX */ return w; } @@ -16674,7 +16673,7 @@ dtrace_state_worker_add(void (*fn)(dtrac void dtrace_state_worker_remove(struct dtrace_state_worker *w) { - int error; + int error __diagused; KASSERT(!w->exiting); mutex_enter(&w->lock);