Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbbDBU20 (ORCPT ); Thu, 2 Apr 2015 16:28:26 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:33199 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbbDBU2Y (ORCPT ); Thu, 2 Apr 2015 16:28:24 -0400 MIME-Version: 1.0 In-Reply-To: References: <1427872339-6688-2-git-send-email-hch@lst.de> Date: Thu, 2 Apr 2015 13:28:23 -0700 X-Google-Sender-Auth: eZNGIvdEWERSE6cxeIp9Cbzun3U Message-ID: Subject: Re: [tip:x86/pmem] x86/mm: Add support for the non-standard protected e820 type From: Yinghai Lu To: axboe@fb.com, Boaz Harrosh , Dan Williams , "H. Peter Anvin" , Andy Lutomirski , Jens Axboe , Linux Kernel Mailing List , Thomas Gleixner , Borislav Petkov , Andrew Morton , Linus Torvalds , Christoph Hellwig , ross.zwisler@linux.intel.com, Ingo Molnar , Matthew Wilcox , keith.busch@intel.com Cc: "linux-tip-commits@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2624 Lines: 72 On Thu, Apr 2, 2015 at 5:31 AM, tip-bot for Christoph Hellwig wrote: > Commit-ID: ec776ef6bbe1734c29cd6bd05219cd93b2731bd4 > Gitweb: http://git.kernel.org/tip/ec776ef6bbe1734c29cd6bd05219cd93b2731bd4 > Author: Christoph Hellwig > AuthorDate: Wed, 1 Apr 2015 09:12:18 +0200 > Committer: Ingo Molnar > CommitDate: Wed, 1 Apr 2015 17:02:43 +0200 > > x86/mm: Add support for the non-standard protected e820 type .. > @@ -688,6 +691,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) > register_nosave_region(pfn, PFN_UP(ei->addr)); > > pfn = PFN_DOWN(ei->addr + ei->size); > + > if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) > register_nosave_region(PFN_UP(ei->addr), pfn); > related? > @@ -748,7 +752,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, unsigned type) > +static unsigned long __init e820_end_pfn(unsigned long limit_pfn) > { > int i; > unsigned long last_pfn = 0; > @@ -759,7 +763,11 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) > unsigned long start_pfn; > unsigned long end_pfn; > > - if (ei->type != type) > + /* > + * Persistent memory is accounted as ram for purposes of > + * establishing max_pfn and mem_map. > + */ > + if (ei->type != E820_RAM && ei->type != E820_PRAM) > continue; > > start_pfn = ei->addr >> PAGE_SHIFT; > @@ -784,12 +792,12 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) > } > unsigned long __init e820_end_of_ram_pfn(void) > { > - return e820_end_pfn(MAX_ARCH_PFN, E820_RAM); > + return e820_end_pfn(MAX_ARCH_PFN); > } > > unsigned long __init e820_end_of_low_ram_pfn(void) > { > - return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM); > + return e820_end_pfn(1UL << (32-PAGE_SHIFT)); > } > > static void early_panic(char *msg) > those eno_of_ram changes are not needed, as it will not used for kernel mapping setup. Thanks Yinghai -- 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/