diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2014-07-16 14:54:55 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2014-07-16 14:56:55 +0200 |
| commit | 13b9a962a2594ee880c5d50d7f70964da1d4fe5a (patch) | |
| tree | 6b9511aa222dcb670293f1db9042b85f3d69e111 /include | |
| parent | locking/spinlocks/mcs: Micro-optimize osq_unlock() (diff) | |
| download | linux-dev-13b9a962a2594ee880c5d50d7f70964da1d4fe5a.tar.xz linux-dev-13b9a962a2594ee880c5d50d7f70964da1d4fe5a.zip | |
locking/rwsem: Rename 'activity' to 'count'
There are two definitions of struct rw_semaphore, one in linux/rwsem.h
and one in linux/rwsem-spinlock.h.
For some reason they have different names for the initial field. This
makes it impossible to use C99 named initialization for
__RWSEM_INITIALIZER() -- or we have to duplicate that entire thing
along with the structure definitions.
The simpler patch is renaming the rwsem-spinlock variant to match the
regular rwsem.
This allows us to switch to C99 named initialization.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-bmrZolsbGmautmzrerog27io@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rwsem-spinlock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h index d5b13bc07a0b..561e8615528d 100644 --- a/include/linux/rwsem-spinlock.h +++ b/include/linux/rwsem-spinlock.h @@ -15,13 +15,13 @@ #ifdef __KERNEL__ /* * the rw-semaphore definition - * - if activity is 0 then there are no active readers or writers - * - if activity is +ve then that is the number of active readers - * - if activity is -1 then there is one active writer + * - if count is 0 then there are no active readers or writers + * - if count is +ve then that is the number of active readers + * - if count is -1 then there is one active writer * - if wait_list is not empty, then there are processes waiting for the semaphore */ struct rw_semaphore { - __s32 activity; + __s32 count; raw_spinlock_t wait_lock; struct list_head wait_list; #ifdef CONFIG_DEBUG_LOCK_ALLOC |