Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde3505c authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Fixup damage done by 22a9835c. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9c1f1257

arch/mips/mips-boards/generic/memory.c

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <linux/mm.h>

#include <linux/bootmem.h>

#include <linux/pfn.h>

#include <linux/string.h>



#include <asm/bootinfo.h>
@@ -104,10 +105,10 @@ struct prom_pmemblock * __init prom_getmdesc(void) 


	mdesc[3].type = yamon_dontuse;

	mdesc[3].base = 0x00100000;

	mdesc[3].size = CPHYSADDR(PAGE_ALIGN((unsigned long)&_end)) - mdesc[3].base;

	mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_end)) - mdesc[3].base;



	mdesc[4].type = yamon_free;

	mdesc[4].base = CPHYSADDR(PAGE_ALIGN(&_end));

	mdesc[4].base = CPHYSADDR(PFN_ALIGN(&_end));

	mdesc[4].size = memsize - mdesc[4].base;



	return &mdesc[0];

arch/mips/mips-boards/sim/sim_mem.c

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/init.h>

#include <linux/mm.h>

#include <linux/bootmem.h>

#include <linux/pfn.h>



#include <asm/bootinfo.h>

#include <asm/page.h>
@@ -59,10 +60,10 @@ struct prom_pmemblock * __init prom_getmdesc(void) 


	mdesc[2].type = simmem_reserved;

	mdesc[2].base = 0x00100000;

	mdesc[2].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[2].base;

	mdesc[2].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[2].base;



	mdesc[3].type = simmem_free;

	mdesc[3].base = CPHYSADDR(PAGE_ALIGN(&_end));

	mdesc[3].base = CPHYSADDR(PFN_ALIGN(&_end));

	mdesc[3].size = memsize - mdesc[3].base;



	return &mdesc[0];