Messages in this thread Patch in this message | | | Date | Sat, 11 Jul 2020 17:59:54 +0300 | From | Alexey Dobriyan <> | Subject | [PATCH] rwsem: fix commas in initialisation |
| |
Leading comma prevents arbitrary reordering of initialisation clauses. The whole point of C99 initialisation is to allow any such reordering.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> ---
include/linux/rwsem.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
--- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -66,22 +66,22 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) #ifdef CONFIG_DEBUG_LOCK_ALLOC # define __RWSEM_DEP_MAP_INIT(lockname) \ - , .dep_map = { \ + .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_SLEEP, \ - } + }, #else # define __RWSEM_DEP_MAP_INIT(lockname) #endif #ifdef CONFIG_DEBUG_RWSEMS -# define __DEBUG_RWSEM_INITIALIZER(lockname) , .magic = &lockname +# define __DEBUG_RWSEM_INITIALIZER(lockname) .magic = &lockname, #else # define __DEBUG_RWSEM_INITIALIZER(lockname) #endif #ifdef CONFIG_RWSEM_SPIN_ON_OWNER -#define __RWSEM_OPT_INIT(lockname) , .osq = OSQ_LOCK_UNLOCKED +#define __RWSEM_OPT_INIT(lockname) .osq = OSQ_LOCK_UNLOCKED, #else #define __RWSEM_OPT_INIT(lockname) #endif @@ -90,7 +90,7 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) { __RWSEM_INIT_COUNT(name), \ .owner = ATOMIC_LONG_INIT(0), \ .wait_list = LIST_HEAD_INIT((name).wait_list), \ - .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock) \ + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ __RWSEM_OPT_INIT(name) \ __DEBUG_RWSEM_INITIALIZER(name) \ __RWSEM_DEP_MAP_INIT(name) }
| |