Date: Fri, 24 Feb 2017 01:39:08 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314187 - head/sys/kern Message-ID: <201702240139.v1O1d86T075687@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Feb 24 01:39:08 2017 New Revision: 314187 URL: https://svnweb.freebsd.org/changeset/base/314187 Log: KDTRACE_HOOKS isn't guaranteed to be defined. Change to check to see if it is defined or not rather than if it is non-zero. Sponsored by: Netflix, Inc Modified: head/sys/kern/kern_mutex.c Modified: head/sys/kern/kern_mutex.c ============================================================================== --- head/sys/kern/kern_mutex.c Thu Feb 23 23:48:44 2017 (r314186) +++ head/sys/kern/kern_mutex.c Fri Feb 24 01:39:08 2017 (r314187) @@ -514,7 +514,7 @@ __mtx_lock_sleep(volatile uintptr_t *c, m->lock_object.lo_name, (void *)m->mtx_lock, file, line); #ifdef LOCK_PROFILING doing_lockprof = 1; -#elif KDTRACE_HOOKS +#elif defined(KDTRACE_HOOKS) doing_lockprof = lockstat_enabled; if (__predict_false(doing_lockprof)) all_time -= lockstat_nsecs(&m->lock_object); @@ -720,7 +720,7 @@ _mtx_lock_spin_cookie(volatile uintptr_t lock_profile_obtain_lock_failed(&m->lock_object, &contested, &waittime); #ifdef LOCK_PROFILING doing_lockprof = 1; -#elif KDTRACE_HOOKS +#elif defined(KDTRACE_HOOKS) doing_lockprof = lockstat_enabled; if (__predict_false(doing_lockprof)) spin_time -= lockstat_nsecs(&m->lock_object); @@ -804,7 +804,7 @@ thread_lock_flags_(struct thread *td, in #ifdef LOCK_PROFILING doing_lockprof = 1; -#elif KDTRACE_HOOKS +#elif defined(KDTRACE_HOOKS) doing_lockprof = lockstat_enabled; if (__predict_false(doing_lockprof)) spin_time -= lockstat_nsecs(&td->td_lock->lock_object);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702240139.v1O1d86T075687>