x86: Revert E820_PRAM change in e820_end_pfn()
diff mbox

Message ID CAE9FiQXNobC1_0YFS1dgy7Ae+vZFU783ttuBsSyw67wXbz2fCg@mail.gmail.com
State New, archived
Headers show

Commit Message

Yinghai Lu April 6, 2015, 6:29 p.m. UTC
On Mon, Apr 6, 2015 at 10:47 AM, Toshi Kani <toshi.kani@hp.com> 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 <yinghai@kernel.org>
> Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> Tested-by: Christoph Hellwig <hch@lst.de>
> ---
> 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

Comments

Toshi Kani April 6, 2015, 6:36 p.m. UTC | #1
On Mon, 2015-04-06 at 11:29 -0700, Yinghai Lu wrote:
> On Mon, Apr 6, 2015 at 10:47 AM, Toshi Kani <toshi.kani@hp.com> 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 <yinghai@kernel.org>
> > Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> > Tested-by: Christoph Hellwig <hch@lst.de>
> > ---
> > 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.

Will do.

Thanks,
-Toshi

Patch
diff mbox

---
 arch/x86/kernel/e820.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: linux-2.6/arch/x86/kernel/e820.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820.c
+++ linux-2.6/arch/x86/kernel/e820.c
@@ -752,7 +752,7 @@  u64 __init early_reserve_e820(u64 size,
 /*
  * Find the highest page frame number we have available
  */
-static unsigned long __init e820_end_pfn(unsigned long limit_pfn)
+static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type)
 {
 	int i;
 	unsigned long last_pfn = 0;
@@ -763,11 +763,7 @@  static unsigned long __init e820_end_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 != type)
 			continue;
 
 		start_pfn = ei->addr >> PAGE_SHIFT;
@@ -792,12 +788,12 @@  static unsigned long __init e820_end_pfn
 }
 unsigned long __init e820_end_of_ram_pfn(void)
 {
-	return e820_end_pfn(MAX_ARCH_PFN);
+	return e820_end_pfn(MAX_ARCH_PFN, E820_RAM);
 }
 
 unsigned long __init e820_end_of_low_ram_pfn(void)
 {
-	return e820_end_pfn(1UL << (32-PAGE_SHIFT));
+	return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM);
 }
 
 static void early_panic(char *msg)