Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757947AbdCUQE4 (ORCPT ); Tue, 21 Mar 2017 12:04:56 -0400 Received: from mail-it0-f44.google.com ([209.85.214.44]:36546 "EHLO mail-it0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757163AbdCUQD3 (ORCPT ); Tue, 21 Mar 2017 12:03:29 -0400 MIME-Version: 1.0 In-Reply-To: <20170321071725.GA15782@gmail.com> References: <20170320194024.60749-1-thgarnie@google.com> <20170321071725.GA15782@gmail.com> From: Thomas Garnier Date: Tue, 21 Mar 2017 09:01:42 -0700 Message-ID: Subject: Re: [PATCH tip v2] x86/mm: Correct fixmap header usage on adaptable MODULES_END To: Ingo Molnar Cc: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Kees Cook , Andrew Morton , Dave Hansen , Borislav Petkov , Hugh Dickins , Xiao Guangrong , Matthew Wilcox , Boris Ostrovsky , Andy Lutomirski , Paul Gortmaker , Michal Hocko , zijun_hu , Chris Wilson , "the arch/x86 maintainers" , LKML , kasan-dev , Linux-MM , Kernel Hardening , Wei Yang Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2720 Lines: 82 On Tue, Mar 21, 2017 at 12:17 AM, Ingo Molnar wrote: > > * Thomas Garnier 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 >> --- >> 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. > Correct, simplify the header and explains better. > 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. I understand. Thanks for merging a clean-up version of this patch. > > 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 > #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 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 > -#include > #include > #include > > 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 > #include > #include > -#include > > extern pud_t level3_kernel_pgt[512]; > extern pud_t level3_ident_pgt[512]; > -- Thomas