Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752935AbbDFSyq (ORCPT ); Mon, 6 Apr 2015 14:54:46 -0400 Received: from g9t5008.houston.hp.com ([15.240.92.66]:39460 "EHLO g9t5008.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752745AbbDFSym (ORCPT ); Mon, 6 Apr 2015 14:54:42 -0400 Message-ID: <1428345377.31093.137.camel@misato.fc.hp.com> Subject: Re: [PATCH] x86: Revert E820_PRAM change in e820_end_pfn() From: Toshi Kani To: Yinghai Lu Cc: Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, the arch/x86 maintainers , Linux Kernel Mailing List , Christoph Hellwig , Boaz Harrosh Date: Mon, 06 Apr 2015 12:36:17 -0600 In-Reply-To: References: <1428342439-31285-1-git-send-email-toshi.kani@hp.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1823 Lines: 48 On Mon, 2015-04-06 at 11:29 -0700, Yinghai Lu wrote: > On Mon, Apr 6, 2015 at 10:47 AM, Toshi Kani wrote: > > 'Commit ec776ef6bbe17 ("x86/mm: Add support for the non-standard > > protected e820 type")' added E820_PRAM ranges, which do not have > > have struct-page. Therefore, there is no need to update max_pfn > > to cover the E820_PRAM ranges. Revert the change made to account > > E820_PRAM as RAM in e820_end_pfn() in the commit. > > > > Signed-off-by: Yinghai Lu > > Signed-off-by: Toshi Kani > > Tested-by: Christoph Hellwig > > --- > > The patch is based on the tip branch. > > --- > > arch/x86/kernel/e820.c | 6 +----- > > 1 file changed, 1 insertion(+), 5 deletions(-) > > > > diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c > > index e2ce85d..4dfe4bd 100644 > > --- a/arch/x86/kernel/e820.c > > +++ b/arch/x86/kernel/e820.c > > @@ -763,11 +763,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 != E820_RAM) > > continue; > > > > start_pfn = ei->addr >> PAGE_SHIFT; > > Please use attached for code change. Will do. Thanks, -Toshi -- 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/