Re: [PATCH tip v2] x86/mm: Correct fixmap header usage on adaptable MODULES_END

[Ingo Molnar]

* Thomas Garnier <thgarnie@xxxxxxxxxx> wrote:

> This patch removes fixmap headers on non-x86 code introduced by the
> adaptable MODULE_END change. It is also removed in the 32-bit pgtable
> header. Instead, it is added  by default in the pgtable generic header
> for both architectures.
> 
> Signed-off-by: Thomas Garnier <thgarnie@xxxxxxxxxx>
> ---
>  arch/x86/include/asm/pgtable.h    | 1 +
>  arch/x86/include/asm/pgtable_32.h | 1 -
>  arch/x86/kernel/module.c          | 1 -
>  arch/x86/mm/dump_pagetables.c     | 1 -
>  arch/x86/mm/kasan_init_64.c       | 1 -
>  mm/vmalloc.c                      | 4 ----
>  6 files changed, 1 insertion(+), 8 deletions(-)

So I already have v1 and there's no explanation about the changes from v1 to v2.

The interdiff between v1 and v2 is below, it only affects x86, presumably it's 
done to simplify the header usage slightly: instead of including fixmap.h in both 
pgtable_32/64.h it's only included in the common pgtable.h file.

That's a sensible cleanup of the original patch and I'd rather not rebase it (as 
tip:x86/mm has other changes as well), so could I've applied the delta cleanup on 
top of the existing changes, with its own changelog.

Thanks,

	Ingo

============>
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 84f6ec4d47ec..9f6809545269 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -601,6 +601,7 @@ pte_t *populate_extra_pte(unsigned long vaddr);
 #include <linux/mm_types.h>
 #include <linux/mmdebug.h>
 #include <linux/log2.h>
+#include <asm/fixmap.h>
 
 static inline int pte_none(pte_t pte)
 {
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index fbc73360aea0..bfab55675c16 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -14,7 +14,6 @@
  */
 #ifndef __ASSEMBLY__
 #include <asm/processor.h>
-#include <asm/fixmap.h>
 #include <linux/threads.h>
 #include <asm/paravirt.h>
 
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 13709cf74ab6..1a4bc71534d4 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -13,7 +13,6 @@
 #include <asm/processor.h>
 #include <linux/bitops.h>
 #include <linux/threads.h>
-#include <asm/fixmap.h>
 
 extern pud_t level3_kernel_pgt[512];
 extern pud_t level3_ident_pgt[512];