linux-kernel - [tip:x86/mm] x86/headers: Simplify asm/fixmap.h inclusion into asm/pgtable*.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 21 Mar 2017 00:24:43 -0700
From:   tip-bot for Thomas Garnier <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     keescook@...omium.org, linux-kernel@...r.kernel.org, bp@...e.de,
        glider@...gle.com, thgarnie@...gle.com, aryabinin@...tuozzo.com,
        dave.hansen@...ux.intel.com, akpm@...ux-foundation.org,
        torvalds@...ux-foundation.org, hughd@...gle.com, zijun_hu@....com,
        mhocko@...e.com, willy@...ux.intel.com, luto@...nel.org,
        paul.gortmaker@...driver.com, hpa@...or.com,
        boris.ostrovsky@...cle.com, peterz@...radead.org, mingo@...nel.org,
        tglx@...utronix.de, dvyukov@...gle.com, chris@...is-wilson.co.uk,
        guangrong.xiao@...ux.intel.com
Subject: [tip:x86/mm] x86/headers: Simplify asm/fixmap.h inclusion into
 asm/pgtable*.h

Commit-ID:  ef37bc361442545a5be3c56c49a08c3153032127
Gitweb:     http://git.kernel.org/tip/ef37bc361442545a5be3c56c49a08c3153032127
Author:     Thomas Garnier <thgarnie@...gle.com>
AuthorDate: Tue, 21 Mar 2017 08:17:25 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 21 Mar 2017 08:21:17 +0100

x86/headers: Simplify asm/fixmap.h inclusion into asm/pgtable*.h

Instead of including fixmap.h twice in pgtable_32.h and pgtable_64.h,
include it only once, in the common asm/pgtable.h header.

Signed-off-by: Thomas Garnier <thgarnie@...gle.com>
Cc: Alexander Potapenko <glider@...gle.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andrey Ryabinin <aryabinin@...tuozzo.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Boris Ostrovsky <boris.ostrovsky@...cle.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: Chris Wilson <chris@...is-wilson.co.uk>
Cc: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: Dmitry Vyukov <dvyukov@...gle.com>
Cc: Hugh Dickins <hughd@...gle.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Matthew Wilcox <willy@...ux.intel.com>
Cc: Michal Hocko <mhocko@...e.com>
Cc: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Xiao Guangrong <guangrong.xiao@...ux.intel.com>
Cc: kasan-dev@...glegroups.com
Cc: kernel-hardening@...ts.openwall.com
Cc: linux-mm@...ck.org
Cc: richard.weiyang@...il.com
Cc: zijun_hu <zijun_hu@....com>
Link: http://lkml.kernel.org/r/20170321071725.GA15782@gmail.com
[ Generated this patch from two other patches and wrote changelog. ]
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/include/asm/pgtable.h    | 1 +
 arch/x86/include/asm/pgtable_32.h | 1 -
 arch/x86/include/asm/pgtable_64.h | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 160256b..18a6f54 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -603,6 +603,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 fbc7336..bfab5567 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 13709cf..1a4bc71 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];