[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAE9FiQVjeBNWtWJDsOhm7Ahh2Ouzfhff4x9UctubwT83T0geYQ@mail.gmail.com>
Date: Thu, 2 Apr 2015 13:28:23 -0700
From: Yinghai Lu <yinghai@...nel.org>
To: axboe@...com, Boaz Harrosh <boaz@...xistor.com>,
Dan Williams <dan.j.williams@...el.com>,
"H. Peter Anvin" <hpa@...or.com>,
Andy Lutomirski <luto@...capital.net>,
Jens Axboe <axboe@...nel.dk>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Thomas Gleixner <tglx@...utronix.de>,
Borislav Petkov <bp@...en8.de>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Christoph Hellwig <hch@....de>, ross.zwisler@...ux.intel.com,
Ingo Molnar <mingo@...nel.org>,
Matthew Wilcox <willy@...ux.intel.com>, keith.busch@...el.com
Cc: "linux-tip-commits@...r.kernel.org"
<linux-tip-commits@...r.kernel.org>
Subject: Re: [tip:x86/pmem] x86/mm: Add support for the non-standard protected
e820 type
On Thu, Apr 2, 2015 at 5:31 AM, tip-bot for Christoph Hellwig
<tipbot@...or.com> wrote:
> Commit-ID: ec776ef6bbe1734c29cd6bd05219cd93b2731bd4
> Gitweb: http://git.kernel.org/tip/ec776ef6bbe1734c29cd6bd05219cd93b2731bd4
> Author: Christoph Hellwig <hch@....de>
> AuthorDate: Wed, 1 Apr 2015 09:12:18 +0200
> Committer: Ingo Molnar <mingo@...nel.org>
> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists