arm/pgtable: Remove duplicate included header file

PATCH RESEND Superseded Thorsten Blum 1 participant 1 message Jan 7, 2025 Arm (32-bit)

lore

Share & tools

lore

Thorsten Blum

author

2025-01-07 10:47 UTC #0 lore raw

PATCH RESEND 1/1 arm/pgtable: Remove duplicate included header file

The header file asm-generic/pgtable-nopud.h is included whether CONFIG_MMU is defined or not.

Include it only once before the #ifndef/#else/#endif preprocessor directives and remove the following make includecheck warning:

asm-generic/pgtable-nopud.h is included more than once

Reviewed-by Mike Rapoport (Microsoft) <[email protected]>

Signed-off-by Thorsten Blum <[email protected]>

---
 arch/arm/include/asm/pgtable.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

arch/arm/include/asm/pgtable.h +2 -3

index be91e376df79..6b986ef6042f 100644
@@ -19,14 +19,13 @@ extern struct page *empty_zero_page;
 #define ZERO_PAGE(vaddr)	(empty_zero_page)
 #endif
 
-#ifndef CONFIG_MMU
-
 #include <asm-generic/pgtable-nopud.h>
+
+#ifndef CONFIG_MMU
 #include <asm/pgtable-nommu.h>
 
 #else
 
-#include <asm-generic/pgtable-nopud.h>
 #include <asm/page.h>
 #include <asm/pgtable-hwdef.h>

Signature · 1 line

2.47.1