Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759411AbbGHRoR (ORCPT ); Wed, 8 Jul 2015 13:44:17 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:38064 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758638AbbGHRoM (ORCPT ); Wed, 8 Jul 2015 13:44:12 -0400 Date: Wed, 8 Jul 2015 18:44:09 +0100 From: Matt Fleming To: Yinghai Lu Cc: Kees Cook , "H. Peter Anvin" , Baoquan He , linux-kernel@vger.kernel.org, Christoph Hellwig , Dan Williams Subject: Re: [PATCH 27/42] x86: restore end_of_ram to E820_RAM Message-ID: <20150708174409.GB5598@codeblueprint.co.uk> References: <1436300428-21163-1-git-send-email-yinghai@kernel.org> <1436300428-21163-28-git-send-email-yinghai@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436300428-21163-28-git-send-email-yinghai@kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2147 Lines: 61 On Tue, 07 Jul, at 01:20:13PM, Yinghai Lu wrote: > We don't need to create mapping for E820_PRAM. > > Signed-off-by: Yinghai Lu > --- > arch/x86/kernel/e820.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c > index a102564..46ec08d 100644 > --- a/arch/x86/kernel/e820.c > +++ b/arch/x86/kernel/e820.c > @@ -753,7 +753,7 @@ u64 __init early_reserve_e820(u64 size, u64 align) > /* > * Find the highest page frame number we have available > */ > -static unsigned long __init e820_end_pfn(unsigned long limit_pfn) > +static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) > { > int i; > unsigned long last_pfn = 0; > @@ -764,11 +764,7 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn) > unsigned long start_pfn; > unsigned long end_pfn; > > - /* > - * Persistent memory is accounted as ram for purposes of > - * establishing max_pfn and mem_map. > - */ > - if (ei->type != E820_RAM && ei->type != E820_PRAM) > + if (ei->type != type) > continue; > > start_pfn = ei->addr >> PAGE_SHIFT; > @@ -793,12 +789,12 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn) > } > unsigned long __init e820_end_of_ram_pfn(void) > { > - return e820_end_pfn(MAX_ARCH_PFN); > + return e820_end_pfn(MAX_ARCH_PFN, E820_RAM); > } > > unsigned long __init e820_end_of_low_ram_pfn(void) > { > - return e820_end_pfn(1UL << (32-PAGE_SHIFT)); > + return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM); > } > > static void early_panic(char *msg) Could you explain why you no longer want to allow pesistent memory to be used in figuring out max_pfn? This partially reverts commit ec776ef6bbe1 ("x86/mm: Add support for the non-standard protected e820 type"). -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/