summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/mmu_decl.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-12-14 09:04:24 -0700
committerGrant Likely <grant.likely@secretlab.ca>2009-12-14 09:04:24 -0700
commitae4cec4736969ec2196a6bbce4ab263ff7cb7eef (patch)
tree23ba5a6155ff43e51b32f9feb1378dc9d3fe2352 /arch/powerpc/mm/mmu_decl.h
parentc0577eeee0101433a0d929699f4543a1ff3c3014 (diff)
downloadblackbird-op-linux-ae4cec4736969ec2196a6bbce4ab263ff7cb7eef.tar.gz
blackbird-op-linux-ae4cec4736969ec2196a6bbce4ab263ff7cb7eef.zip
powerpc: fix up for mmu_mapin_ram api change
Today's linux-next build (powerpc ppc44x_defconfig) failed like this: arch/powerpc/mm/pgtable_32.c: In function 'mapin_ram': arch/powerpc/mm/pgtable_32.c:318: error: too many arguments to function 'mmu_mapin_ram' Casued by commit de32400dd26e743c5d500aa42d8d6818b79edb73 ("wii: use both mem1 and mem2 as ram"). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/mm/mmu_decl.h')
-rw-r--r--arch/powerpc/mm/mmu_decl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index 34dacc32250d..06f708c38f1b 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -150,15 +150,15 @@ extern void wii_memory_fixups(void);
*/
#if defined(CONFIG_8xx)
#define MMU_init_hw() do { } while(0)
-#define mmu_mapin_ram() (0UL)
+#define mmu_mapin_ram(top) (0UL)
#elif defined(CONFIG_4xx)
extern void MMU_init_hw(void);
-extern unsigned long mmu_mapin_ram(void);
+extern unsigned long mmu_mapin_ram(unsigned long top);
#elif defined(CONFIG_FSL_BOOKE)
extern void MMU_init_hw(void);
-extern unsigned long mmu_mapin_ram(void);
+extern unsigned long mmu_mapin_ram(unsigned long top);
extern void adjust_total_lowmem(void);
#elif defined(CONFIG_PPC32)
OpenPOWER on IntegriCloud