Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932137AbdCUHoy (ORCPT ); Tue, 21 Mar 2017 03:44:54 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34574 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752227AbdCUHnP (ORCPT ); Tue, 21 Mar 2017 03:43:15 -0400 Date: Tue, 21 Mar 2017 00:24:43 -0700 From: tip-bot for Thomas Garnier Message-ID: Cc: keescook@chromium.org, linux-kernel@vger.kernel.org, bp@suse.de, glider@google.com, thgarnie@google.com, aryabinin@virtuozzo.com, dave.hansen@linux.intel.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, hughd@google.com, zijun_hu@htc.com, mhocko@suse.com, willy@linux.intel.com, luto@kernel.org, paul.gortmaker@windriver.com, hpa@zytor.com, boris.ostrovsky@oracle.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, dvyukov@google.com, chris@chris-wilson.co.uk, guangrong.xiao@linux.intel.com Reply-To: keescook@chromium.org, bp@suse.de, linux-kernel@vger.kernel.org, glider@google.com, aryabinin@virtuozzo.com, thgarnie@google.com, dave.hansen@linux.intel.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, hughd@google.com, zijun_hu@htc.com, mhocko@suse.com, luto@kernel.org, willy@linux.intel.com, paul.gortmaker@windriver.com, hpa@zytor.com, boris.ostrovsky@oracle.com, peterz@infradead.org, mingo@kernel.org, dvyukov@google.com, tglx@linutronix.de, chris@chris-wilson.co.uk, guangrong.xiao@linux.intel.com In-Reply-To: <20170321071725.GA15782@gmail.com> References: <20170321071725.GA15782@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/headers: Simplify asm/fixmap.h inclusion into asm/pgtable*.h Git-Commit-ID: ef37bc361442545a5be3c56c49a08c3153032127 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2990 Lines: 81 Commit-ID: ef37bc361442545a5be3c56c49a08c3153032127 Gitweb: http://git.kernel.org/tip/ef37bc361442545a5be3c56c49a08c3153032127 Author: Thomas Garnier AuthorDate: Tue, 21 Mar 2017 08:17:25 +0100 Committer: Ingo Molnar 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 Cc: Alexander Potapenko Cc: Andrew Morton Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Boris Ostrovsky Cc: Borislav Petkov Cc: Chris Wilson Cc: Dave Hansen Cc: Dmitry Vyukov Cc: Hugh Dickins Cc: Kees Cook Cc: Linus Torvalds Cc: Matthew Wilcox Cc: Michal Hocko Cc: Paul Gortmaker Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Xiao Guangrong Cc: kasan-dev@googlegroups.com Cc: kernel-hardening@lists.openwall.com Cc: linux-mm@kvack.org Cc: richard.weiyang@gmail.com Cc: zijun_hu 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 --- 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 #include #include +#include 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 -#include #include #include 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 #include #include -#include extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512];