* [PATCH] fix MIPS PFN/page borkage
@ 2006-04-03 16:11 Dave Hansen
2006-04-03 16:16 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Dave Hansen @ 2006-04-03 16:11 UTC (permalink / raw)
To: ralf; +Cc: linux-kernel, Dave Hansen
The "unify PFN_* macros" patch screwed up and somehow modified
the MIPS code where it shouldn't have. This backs those changes
back out.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
work-dave/arch/mips/mips-boards/generic/memory.c | 4 ++--
work-dave/arch/mips/mips-boards/sim/sim_mem.c | 4 ++--
2 files changed, 4 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:09:42.000000000 -0700
@@ -106,10 +106,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:09:42.000000000 -0700
@@ -61,10 +61,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];
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] fix MIPS PFN/page borkage
2006-04-03 16:11 [PATCH] fix MIPS PFN/page borkage Dave Hansen
@ 2006-04-03 16:16 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2006-04-03 16:16 UTC (permalink / raw)
To: Dave Hansen; +Cc: linux-kernel
On Mon, Apr 03, 2006 at 09:11:31AM -0700, Dave Hansen wrote:
> The "unify PFN_* macros" patch screwed up and somehow modified
> the MIPS code where it shouldn't have. This backs those changes
> back out.
You need to include <linux/pfn.h> for this to build.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-04-03 16:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-03 16:11 [PATCH] fix MIPS PFN/page borkage Dave Hansen
2006-04-03 16:16 ` Ralf Baechle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.