Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752992AbbDFSF6 (ORCPT ); Mon, 6 Apr 2015 14:05:58 -0400 Received: from g4t3425.houston.hp.com ([15.201.208.53]:22214 "EHLO g4t3425.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752779AbbDFSFz (ORCPT ); Mon, 6 Apr 2015 14:05:55 -0400 From: Toshi Kani To: mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de Cc: linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, hch@lst.de, boaz@plexistor.com, Yinghai Lu , Toshi Kani Subject: [PATCH] x86: Revert E820_PRAM change in e820_end_pfn() Date: Mon, 6 Apr 2015 11:47:19 -0600 Message-Id: <1428342439-31285-1-git-send-email-toshi.kani@hp.com> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1368 Lines: 37 '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; -- 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/