I'm looking to enable -Wmissing-variable-declarations behind W=1. 0day
bot spotted the following instance in ARCH=riscv builds:
arch/riscv/mm/init.c:276:7: warning: no previous extern declaration
for non-static variable 'trampoline_pg_dir'
[-Wmissing-variable-declarations]
276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
| ^
arch/riscv/mm/init.c:276:1: note: declare 'static' if the variable is
not intended to be used outside of this translation unit
276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
| ^
arch/riscv/mm/init.c:279:7: warning: no previous extern declaration
for non-static variable 'early_pg_dir'
[-Wmissing-variable-declarations]
279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
| ^
arch/riscv/mm/init.c:279:1: note: declare 'static' if the variable is
not intended to be used outside of this translation unit
279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
| ^
These symbols are referenced by more than one translation unit, so make
sure they're both declared and include the correct header for their
declarations. Finally, sort the list of includes to help keep them tidy.
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/llvm/[email protected]/
Signed-off-by: Nick Desaulniers <[email protected]>
---
Changes in v2:
- Forward declare early_pg_dir, too.
- Remove declaration of early_pg_dir from arch/riscv/mm/kasan_init.c.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
arch/riscv/include/asm/pgtable.h | 2 ++
arch/riscv/mm/init.c | 9 +++++----
arch/riscv/mm/kasan_init.c | 1 -
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 75970ee2bda2..b5680c940c1e 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -188,6 +188,8 @@ extern struct pt_alloc_ops pt_ops __initdata;
#define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP)
extern pgd_t swapper_pg_dir[];
+extern pgd_t trampoline_pg_dir[];
+extern pgd_t early_pg_dir[];
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
static inline int pmd_present(pmd_t pmd)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 9ce504737d18..cc0e06b4f223 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -26,12 +26,13 @@
#include <linux/kfence.h>
#include <asm/fixmap.h>
-#include <asm/tlbflush.h>
-#include <asm/sections.h>
-#include <asm/soc.h>
#include <asm/io.h>
-#include <asm/ptdump.h>
#include <asm/numa.h>
+#include <asm/pgtable.h>
+#include <asm/ptdump.h>
+#include <asm/sections.h>
+#include <asm/soc.h>
+#include <asm/tlbflush.h>
#include "../kernel/head.h"
diff --git a/arch/riscv/mm/kasan_init.c b/arch/riscv/mm/kasan_init.c
index 8fc0efcf905c..a01bc15dce24 100644
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@ -22,7 +22,6 @@
* region is not and then we have to go down to the PUD level.
*/
-extern pgd_t early_pg_dir[PTRS_PER_PGD];
pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
---
base-commit: 14f9643dc90adea074a0ffb7a17d337eafc6a5cc
change-id: 20230808-riscv_static-348036edcae7
Best regards,
--
Nick Desaulniers <[email protected]>
Hello:
This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:
On Tue, 08 Aug 2023 09:35:00 -0700 you wrote:
> I'm looking to enable -Wmissing-variable-declarations behind W=1. 0day
> bot spotted the following instance in ARCH=riscv builds:
>
> arch/riscv/mm/init.c:276:7: warning: no previous extern declaration
> for non-static variable 'trampoline_pg_dir'
> [-Wmissing-variable-declarations]
> 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
> | ^
> arch/riscv/mm/init.c:276:1: note: declare 'static' if the variable is
> not intended to be used outside of this translation unit
> 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
> | ^
> arch/riscv/mm/init.c:279:7: warning: no previous extern declaration
> for non-static variable 'early_pg_dir'
> [-Wmissing-variable-declarations]
> 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
> | ^
> arch/riscv/mm/init.c:279:1: note: declare 'static' if the variable is
> not intended to be used outside of this translation unit
> 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
> | ^
>
> [...]
Here is the summary with links:
- [v2] riscv: mm: fix 2 instances of -Wmissing-variable-declarations
https://git.kernel.org/riscv/c/d2402048bc8a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
On Tue, 08 Aug 2023 09:35:00 -0700, Nick Desaulniers wrote:
> I'm looking to enable -Wmissing-variable-declarations behind W=1. 0day
> bot spotted the following instance in ARCH=riscv builds:
>
> arch/riscv/mm/init.c:276:7: warning: no previous extern declaration
> for non-static variable 'trampoline_pg_dir'
> [-Wmissing-variable-declarations]
> 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
> | ^
> arch/riscv/mm/init.c:276:1: note: declare 'static' if the variable is
> not intended to be used outside of this translation unit
> 276 | pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
> | ^
> arch/riscv/mm/init.c:279:7: warning: no previous extern declaration
> for non-static variable 'early_pg_dir'
> [-Wmissing-variable-declarations]
> 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
> | ^
> arch/riscv/mm/init.c:279:1: note: declare 'static' if the variable is
> not intended to be used outside of this translation unit
> 279 | pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);
> | ^
>
> [...]
Applied, thanks!
[1/1] riscv: mm: fix 2 instances of -Wmissing-variable-declarations
https://git.kernel.org/palmer/c/d2402048bc8a
Best regards,
--
Palmer Dabbelt <[email protected]>