Skip to content

Commit edfcf91

Browse files
guoren83palmer-dabbelt
authored andcommitted
riscv: Fixup compile error BUILD_BUG_ON failed
Unfortunately, the current code couldn't be compiled: CC arch/riscv/kernel/patch.o In file included from ./include/linux/kernel.h:11, from ./include/linux/list.h:9, from ./include/linux/preempt.h:11, from ./include/linux/spinlock.h:51, from arch/riscv/kernel/patch.c:6: In function ‘fix_to_virt’, inlined from ‘patch_map’ at arch/riscv/kernel/patch.c:37:17: ./include/linux/compiler.h:392:38: error: call to ‘__compiletime_assert_205’ declared with attribute error: BUILD_BUG_ON failed: idx >= __end_of_fixed_addresses _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ ./include/linux/compiler.h:373:4: note: in definition of macro ‘__compiletime_assert’ prefix ## suffix(); \ ^~~~~~ ./include/linux/compiler.h:392:2: note: in expansion of macro ‘_compiletime_assert’ _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ ./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’ #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ ./include/linux/build_bug.h:50:2: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) ^~~~~~~~~~~~~~~~ ./include/asm-generic/fixmap.h:32:2: note: in expansion of macro ‘BUILD_BUG_ON’ BUILD_BUG_ON(idx >= __end_of_fixed_addresses); ^~~~~~~~~~~~ Because fix_to_virt(, idx) needs a const value, not a dynamic variable of reg-a0 or BUILD_BUG_ON failed with "idx >= __end_of_fixed_addresses". Signed-off-by: Guo Ren <[email protected]> Reviewed-by: Masami Hiramatsu <[email protected]> Reviewed-by: Pekka Enberg <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent dcdc7a5 commit edfcf91

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

arch/riscv/kernel/patch.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ struct patch_insn {
2020
};
2121

2222
#ifdef CONFIG_MMU
23-
static void *patch_map(void *addr, int fixmap)
23+
/*
24+
* The fix_to_virt(, idx) needs a const value (not a dynamic variable of
25+
* reg-a0) or BUILD_BUG_ON failed with "idx >= __end_of_fixed_addresses".
26+
* So use '__always_inline' and 'const unsigned int fixmap' here.
27+
*/
28+
static __always_inline void *patch_map(void *addr, const unsigned int fixmap)
2429
{
2530
uintptr_t uintaddr = (uintptr_t) addr;
2631
struct page *page;
@@ -37,7 +42,6 @@ static void *patch_map(void *addr, int fixmap)
3742
return (void *)set_fixmap_offset(fixmap, page_to_phys(page) +
3843
(uintaddr & ~PAGE_MASK));
3944
}
40-
NOKPROBE_SYMBOL(patch_map);
4145

4246
static void patch_unmap(int fixmap)
4347
{

0 commit comments

Comments
 (0)