xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

seqlock: avoid -Wshadow warnings

Browse Source 
[ Upstream commit a07c45312f06e288417049208c344ad76074627d ]

When building with W=2, there is a flood of warnings about the seqlock
macros shadowing local variables:

  19806 linux/seqlock.h:331:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]
     48 linux/seqlock.h:348:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]
      8 linux/seqlock.h:379:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]

Prefix the local variables to make the warning useful elsewhere again.

Fixes: 52ac39e5db ("seqlock: seqcount_t: Implement all read APIs as statement expressions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201026165044.3722931-1-arnd@kernel.org
Stable-dep-of: 41b43b6c6e30 ("locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnd Bergmann
2020-10-26 17:50:38 +01:00
committed by Greg Kroah-Hartman
parent f1893feb20
commit a8460ee6c8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/seqlock.h
View File

@@ -328,13 +328,13 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu
*/ */
#define __read_seqcount_begin(s) \ #define __read_seqcount_begin(s) \
({ \ ({ \
unsigned seq; \ unsigned __seq; \
\ \
while ((seq = __seqcount_sequence(s)) & 1) \ while ((__seq = __seqcount_sequence(s)) & 1) \
cpu_relax(); \ cpu_relax(); \
\ \
kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \
seq; \ __seq; \
}) })
/** /**
@@ -345,10 +345,10 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu
*/ */
#define raw_read_seqcount_begin(s) \ #define raw_read_seqcount_begin(s) \
({ \ ({ \
unsigned seq = __read_seqcount_begin(s); \ unsigned _seq = __read_seqcount_begin(s); \
\ \
smp_rmb(); \ smp_rmb(); \
seq; \ _seq; \
}) })
/** /**
@@ -376,11 +376,11 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu
*/ */
#define raw_read_seqcount(s) \ #define raw_read_seqcount(s) \
({ \ ({ \
unsigned seq = __seqcount_sequence(s); \ unsigned __seq = __seqcount_sequence(s); \
\ \
smp_rmb(); \ smp_rmb(); \
kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \
seq; \ __seq; \
}) })
/** /**