diff options
authorArnd Bergmann <>2021-05-22 17:41:43 -0700
committerLinus Torvalds <>2021-05-22 15:09:07 -1000
commitf9f74dc218c3cfdf0b7f9a95ddae81a081bdb79d (patch)
parent4ff2473bdb4cf2bb7d208ccf4418d3d7e6b1652c (diff)
mm/shuffle: fix section mismatch warning
clang sometimes decides not to inline shuffle_zone(), but it calls a __meminit function. Without the extra __meminit annotation we get this warning: WARNING: modpost: vmlinux.o(.text+0x2a86d4): Section mismatch in reference from the function shuffle_zone() to the function .meminit.text:__shuffle_zone() The function shuffle_zone() references the function __meminit __shuffle_zone(). This is often because shuffle_zone lacks a __meminit annotation or the annotation of __shuffle_zone is wrong. shuffle_free_memory() did not show the same problem in my tests, but it could happen in theory as well, so mark both as __meminit. Link: Signed-off-by: Arnd Bergmann <> Reviewed-by: David Hildenbrand <> Reviewed-by: Nathan Chancellor <> Cc: Nick Desaulniers <> Cc: Arnd Bergmann <> Cc: Wei Yang <> Cc: Dan Williams <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shuffle.h b/mm/shuffle.h
index 71b784f0b7c3..cec62984f7d3 100644
--- a/mm/shuffle.h
+++ b/mm/shuffle.h
@@ -10,7 +10,7 @@
extern void __shuffle_free_memory(pg_data_t *pgdat);
extern bool shuffle_pick_tail(void);
-static inline void shuffle_free_memory(pg_data_t *pgdat)
+static inline void __meminit shuffle_free_memory(pg_data_t *pgdat)
if (!static_branch_unlikely(&page_alloc_shuffle_key))
@@ -18,7 +18,7 @@ static inline void shuffle_free_memory(pg_data_t *pgdat)
extern void __shuffle_zone(struct zone *z);
-static inline void shuffle_zone(struct zone *z)
+static inline void __meminit shuffle_zone(struct zone *z)
if (!static_branch_unlikely(&page_alloc_shuffle_key))