From patchwork Mon Apr 6 17:47:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Toshi Kani X-Patchwork-Id: 6163591 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4ACA99F1BE for ; Mon, 6 Apr 2015 18:06:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73E9F20340 for ; Mon, 6 Apr 2015 18:06:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84D8120303 for ; Mon, 6 Apr 2015 18:06:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbbDFSF5 (ORCPT ); Mon, 6 Apr 2015 14:05:57 -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 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3425.houston.hp.com (Postfix) with ESMTP id DE4146D; Mon, 6 Apr 2015 18:05:53 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g4t3433.houston.hp.com (Postfix) with ESMTP id BF8E370; Mon, 6 Apr 2015 18:05:49 +0000 (UTC) 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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP '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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;