Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603762

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

Show all headers | View raw

Commit-ID:  f991376e444aee8f5643a45703c1433bf7948940
Gitweb:     http://git.kernel.org/tip/f991376e444aee8f5643a45703c1433bf7948940
Author:     Thomas Garnier <thgarnie@google.com>
AuthorDate: Fri, 17 Mar 2017 10:50:34 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 18 Mar 2017 09:48:00 +0100

x86/mm: Correct fixmap header usage on adaptable MODULES_END

This patch removes fixmap header usage on non-x86 code that was
introduced by the adaptable MODULE_END change.

Signed-off-by: Thomas Garnier <thgarnie@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20170317175034.4701-1-thgarnie@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/pgtable_64.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 ----
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 73c7ccc..67608d4 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -13,6 +13,7 @@
 #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];
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index fad61ca..477ae80 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -35,7 +35,6 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
-#include <asm/fixmap.h>
 
 #if 0
 #define DEBUGP(fmt, ...)				\
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 75efeec..58b5bee 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -20,7 +20,6 @@
 
 #include <asm/kasan.h>
 #include <asm/pgtable.h>
-#include <asm/fixmap.h>
 
 /*
  * The dumper groups pagetable entries of the same type into one, and for
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 1bde19e..8d63d7a 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -9,7 +9,6 @@
 
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
-#include <asm/fixmap.h>
 
 extern pgd_t early_level4_pgt[PTRS_PER_PGD];
 extern struct range pfn_mapped[E820_X_MAX];
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index b7d2a23..0dd8022 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -36,10 +36,6 @@
 #include <asm/tlbflush.h>
 #include <asm/shmparam.h>
 
-#ifdef CONFIG_X86
-# include <asm/fixmap.h>
-#endif
-
 #include "internal.h"
 
 struct vfree_deferred {

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH tip] x86/mm: Correct fixmap header usage on adaptable MODULES_END Thomas Garnier <thgarnie@google.com> - 2017-03-17 19:00 +0100
  [tip:x86/mm] x86/mm: Correct fixmap header usage on adaptable  MODULES_END tip-bot for Thomas Garnier <tipbot@zytor.com> - 2017-03-18 11:50 +0100
  Re: [PATCH tip] x86/mm: Correct fixmap header usage on adaptable  MODULES_END Wei Yang <richard.weiyang@gmail.com> - 2017-03-19 17:20 +0100
    Re: [PATCH tip] x86/mm: Correct fixmap header usage on adaptable MODULES_END Thomas Garnier <thgarnie@google.com> - 2017-03-19 18:00 +0100
      Re: [PATCH tip] x86/mm: Correct fixmap header usage on adaptable  MODULES_END Wei Yang <richard.weiyang@gmail.com> - 2017-03-20 02:20 +0100
        Re: [PATCH tip] x86/mm: Correct fixmap header usage on adaptable MODULES_END Thomas Garnier <thgarnie@google.com> - 2017-03-20 16:00 +0100
          Re: [PATCH tip] x86/mm: Correct fixmap header usage on adaptable  MODULES_END Wei Yang <richard.weiyang@gmail.com> - 2017-03-20 18:00 +0100

csiph-web