Commit 3694bd76 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas

asm-generic: Fix local variable shadow in __set_fixmap_offset

Currently __set_fixmap_offset is a macro function which has a local
variable called 'addr'. If a caller passes a 'phys' parameter which is
derived from a variable also called 'addr', the local variable will
shadow this, and the compiler will complain about the use of an
uninitialized variable. To avoid the issue with namespace clashes,
'addr' is prefixed with a liberal sprinkling of underscores.

Turning __set_fixmap_offset into a static inline breaks the build for
several architectures. Fixing this properly requires updates to a number
of architectures to make them agree on the prototype of __set_fixmap (it
could be done as a subsequent patch series).
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
[catalin.marinas@arm.com: squashed the original function patch and macro fixup]
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 18558cae
...@@ -70,12 +70,12 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) ...@@ -70,12 +70,12 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
#endif #endif
/* Return a pointer with offset calculated */ /* Return a pointer with offset calculated */
#define __set_fixmap_offset(idx, phys, flags) \ #define __set_fixmap_offset(idx, phys, flags) \
({ \ ({ \
unsigned long addr; \ unsigned long ________addr; \
__set_fixmap(idx, phys, flags); \ __set_fixmap(idx, phys, flags); \
addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \ ________addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \
addr; \ ________addr; \
}) })
#define set_fixmap_offset(idx, phys) \ #define set_fixmap_offset(idx, phys) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment