d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locks: fix up ifdef guards introduced in r303643

Browse Source 
Both sx and rwlocks had copy-pasted ADAPTIVE_MUTEXES instead of the correct
define.

MFC after:	1 week
This commit is contained in:
Mateusz Guzik 2016-08-02 00:15:08 +00:00
parent 9809e9dc3a
commit 0412689595
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=303652
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_rwlock.c
View File

@ -383,7 +383,7 @@ __rw_rlock(volatile uintptr_t *c, const char *file, int line)
int contested = 0;
#endif
uintptr_t v;
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_RWLOCKS) || defined(KDTRACE_HOOKS)
struct lock_delay_arg lda;
#endif
#ifdef KDTRACE_HOOKS
@ -396,7 +396,7 @@ __rw_rlock(volatile uintptr_t *c, const char *file, int line)
if (SCHEDULER_STOPPED())
return;
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_RWLOCKS) || defined(KDTRACE_HOOKS)
lock_delay_arg_init(&lda, &rw_delay);
#endif
rw = rwlock2rw(c);
@ -769,7 +769,7 @@ __rw_wlock_hard(volatile uintptr_t *c, uintptr_t tid, const char *file,
uint64_t waittime = 0;
int contested = 0;
#endif
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_RWLOCKS) || defined(KDTRACE_HOOKS)
struct lock_delay_arg lda;
#endif
#ifdef KDTRACE_HOOKS
@ -782,7 +782,7 @@ __rw_wlock_hard(volatile uintptr_t *c, uintptr_t tid, const char *file,
if (SCHEDULER_STOPPED())
return;
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_RWLOCKS) || defined(KDTRACE_HOOKS)
lock_delay_arg_init(&lda, &rw_delay);
#endif
rw = rwlock2rw(c);

8
sys/kern/kern_sx.c
View File

@ -541,7 +541,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file,
int contested = 0;
#endif
int error = 0;
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_SX) || defined(KDTRACE_HOOKS)
struct lock_delay_arg lda;
#endif
#ifdef KDTRACE_HOOKS
@ -554,7 +554,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file,
if (SCHEDULER_STOPPED())
return (0);
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_SX) || defined(KDTRACE_HOOKS)
lock_delay_arg_init(&lda, &sx_delay);
#endif
@ -848,7 +848,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line)
#endif
uintptr_t x;
int error = 0;
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_SX) || defined(KDTRACE_HOOKS)
struct lock_delay_arg lda;
#endif
#ifdef KDTRACE_HOOKS
@ -861,7 +861,7 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line)
if (SCHEDULER_STOPPED())
return (0);
#if defined(ADAPTIVE_MUTEXES) || defined(KDTRACE_HOOKS)
#if defined(ADAPTIVE_SX) || defined(KDTRACE_HOOKS)
lock_delay_arg_init(&lda, &sx_delay);
#endif
#ifdef KDTRACE_HOOKS