mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-28 03:40:04 +00:00
Code Issues Releases Wiki Activity

asm-generic: percpu: avoid Wshadow warning

Browse source 
Nesting macros that use the same local variable names causes
warnings when building with "make W=2":

include/asm-generic/percpu.h:117:14: warning: declaration of '__ret' shadows a previous local [-Wshadow]
include/asm-generic/percpu.h:126:14: warning: declaration of '__ret' shadows a previous local [-Wshadow]

These are fairly harmless, but since the warning comes from
a global header, the warning happens every time the headers
are included, which is fairly annoying.

Rename the variables to avoid shadowing and shut up the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-10-21 17:18:05 +02:00
parent 2a45a08a5b
commit 80b4707a2f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/asm-generic/percpu.h
View file

@ -114,21 +114,21 @@ do { \
#define __this_cpu_generic_read_nopreempt(pcp) \ #define __this_cpu_generic_read_nopreempt(pcp) \
({ \ ({ \
typeof(pcp) __ret; \ typeof(pcp) ___ret; \
preempt_disable_notrace(); \ preempt_disable_notrace(); \
__ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ___ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \
preempt_enable_notrace(); \ preempt_enable_notrace(); \
__ret; \ ___ret; \
}) })
#define __this_cpu_generic_read_noirq(pcp) \ #define __this_cpu_generic_read_noirq(pcp) \
({ \ ({ \
typeof(pcp) __ret; \ typeof(pcp) ___ret; \
unsigned long __flags; \ unsigned long ___flags; \
raw_local_irq_save(__flags); \ raw_local_irq_save(___flags); \
__ret = raw_cpu_generic_read(pcp); \ ___ret = raw_cpu_generic_read(pcp); \
raw_local_irq_restore(__flags); \ raw_local_irq_restore(___flags); \
__ret; \ ___ret; \
}) })
#define this_cpu_generic_read(pcp) \ #define this_cpu_generic_read(pcp) \