Messages in this thread Patch in this message | | | Subject | [PATCH] fix MIPS PFN/page borkage (take 2) | From | Dave Hansen <> | Date | Mon, 03 Apr 2006 09:21:17 -0700 |
| |
The "unify PFN_* macros" patch screwed up and somehow modified the MIPS code where it shouldn't have. This backs those changes back out.
Also remember to include the new header in the MIPS files.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com> ---
work-dave/arch/mips/mips-boards/generic/memory.c | 5 +++-- work-dave/arch/mips/mips-boards/sim/sim_mem.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN arch/mips/mips-boards/generic/memory.c~unify_PFN_macros arch/mips/mips-boards/generic/memory.c --- work/arch/mips/mips-boards/generic/memory.c~unify_PFN_macros 2006-04-03 09:09:42.000000000 -0700 +++ work-dave/arch/mips/mips-boards/generic/memory.c 2006-04-03 09:20:36.000000000 -0700 @@ -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> @@ -106,10 +107,10 @@ struct prom_pmemblock * __init prom_getm mdesc[3].type = yamon_dontuse; mdesc[3].base = 0x00100000; - mdesc[3].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[3].base; + mdesc[3].size = CPHYSADDR(PFN_ALIGN(&_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]; diff -puN arch/mips/mips-boards/sim/sim_mem.c~unify_PFN_macros arch/mips/mips-boards/sim/sim_mem.c --- work/arch/mips/mips-boards/sim/sim_mem.c~unify_PFN_macros 2006-04-03 09:09:42.000000000 -0700 +++ work-dave/arch/mips/mips-boards/sim/sim_mem.c 2006-04-03 09:20:46.000000000 -0700 @@ -17,6 +17,7 @@ */ #include <linux/init.h> #include <linux/mm.h> +#include <linux/pfn.h> #include <linux/bootmem.h> #include <asm/bootinfo.h> @@ -61,10 +62,10 @@ struct prom_pmemblock * __init prom_getm 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]; _ - 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/
| |