Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753095AbbDFS3i (ORCPT ); Mon, 6 Apr 2015 14:29:38 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:34699 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752693AbbDFS3h (ORCPT ); Mon, 6 Apr 2015 14:29:37 -0400 MIME-Version: 1.0 In-Reply-To: <1428342439-31285-1-git-send-email-toshi.kani@hp.com> References: <1428342439-31285-1-git-send-email-toshi.kani@hp.com> Date: Mon, 6 Apr 2015 11:29:36 -0700 X-Google-Sender-Auth: jtk2rX8ybPugikhCykzPUVMsTP4 Message-ID: Subject: Re: [PATCH] x86: Revert E820_PRAM change in e820_end_pfn() From: Yinghai Lu To: Toshi Kani 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 Content-Type: multipart/mixed; boundary=001a113e94b2f1ecf80513127af0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3906 Lines: 80 --001a113e94b2f1ecf80513127af0 Content-Type: text/plain; charset=UTF-8 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. Thanks Yinghai --001a113e94b2f1ecf80513127af0 Content-Type: text/x-patch; charset=US-ASCII; name="revert_end_of_ram_change.patch" Content-Disposition: attachment; filename="revert_end_of_ram_change.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i867oto10 LS0tCiBhcmNoL3g4Ni9rZXJuZWwvZTgyMC5jIHwgICAxMiArKysrLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpJbmRleDogbGludXgtMi42 L2FyY2gveDg2L2tlcm5lbC9lODIwLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGludXgtMi42Lm9yaWcvYXJj aC94ODYva2VybmVsL2U4MjAuYworKysgbGludXgtMi42L2FyY2gveDg2L2tlcm5lbC9lODIwLmMK QEAgLTc1Miw3ICs3NTIsNyBAQCB1NjQgX19pbml0IGVhcmx5X3Jlc2VydmVfZTgyMCh1NjQgc2l6 ZSwKIC8qCiAgKiBGaW5kIHRoZSBoaWdoZXN0IHBhZ2UgZnJhbWUgbnVtYmVyIHdlIGhhdmUgYXZh aWxhYmxlCiAgKi8KLXN0YXRpYyB1bnNpZ25lZCBsb25nIF9faW5pdCBlODIwX2VuZF9wZm4odW5z aWduZWQgbG9uZyBsaW1pdF9wZm4pCitzdGF0aWMgdW5zaWduZWQgbG9uZyBfX2luaXQgZTgyMF9l bmRfcGZuKHVuc2lnbmVkIGxvbmcgbGltaXRfcGZuLCB1bnNpZ25lZCB0eXBlKQogewogCWludCBp OwogCXVuc2lnbmVkIGxvbmcgbGFzdF9wZm4gPSAwOwpAQCAtNzYzLDExICs3NjMsNyBAQCBzdGF0 aWMgdW5zaWduZWQgbG9uZyBfX2luaXQgZTgyMF9lbmRfcGZuCiAJCXVuc2lnbmVkIGxvbmcgc3Rh cnRfcGZuOwogCQl1bnNpZ25lZCBsb25nIGVuZF9wZm47CiAKLQkJLyoKLQkJICogUGVyc2lzdGVu dCBtZW1vcnkgaXMgYWNjb3VudGVkIGFzIHJhbSBmb3IgcHVycG9zZXMgb2YKLQkJICogZXN0YWJs aXNoaW5nIG1heF9wZm4gYW5kIG1lbV9tYXAuCi0JCSAqLwotCQlpZiAoZWktPnR5cGUgIT0gRTgy MF9SQU0gJiYgZWktPnR5cGUgIT0gRTgyMF9QUkFNKQorCQlpZiAoZWktPnR5cGUgIT0gdHlwZSkK IAkJCWNvbnRpbnVlOwogCiAJCXN0YXJ0X3BmbiA9IGVpLT5hZGRyID4+IFBBR0VfU0hJRlQ7CkBA IC03OTIsMTIgKzc4OCwxMiBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBfX2luaXQgZTgyMF9lbmRf cGZuCiB9CiB1bnNpZ25lZCBsb25nIF9faW5pdCBlODIwX2VuZF9vZl9yYW1fcGZuKHZvaWQpCiB7 Ci0JcmV0dXJuIGU4MjBfZW5kX3BmbihNQVhfQVJDSF9QRk4pOworCXJldHVybiBlODIwX2VuZF9w Zm4oTUFYX0FSQ0hfUEZOLCBFODIwX1JBTSk7CiB9CiAKIHVuc2lnbmVkIGxvbmcgX19pbml0IGU4 MjBfZW5kX29mX2xvd19yYW1fcGZuKHZvaWQpCiB7Ci0JcmV0dXJuIGU4MjBfZW5kX3BmbigxVUwg PDwgKDMyLVBBR0VfU0hJRlQpKTsKKwlyZXR1cm4gZTgyMF9lbmRfcGZuKDFVTDw8KDMyIC0gUEFH RV9TSElGVCksIEU4MjBfUkFNKTsKIH0KIAogc3RhdGljIHZvaWQgZWFybHlfcGFuaWMoY2hhciAq bXNnKQo= --001a113e94b2f1ecf80513127af0-- -- 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/