Commit ae4cec47 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Grant Likely

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 de32400d ("wii: use both
mem1 and mem2 as ram").
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent c0577eee
...@@ -91,7 +91,7 @@ void __init MMU_init_hw(void) ...@@ -91,7 +91,7 @@ void __init MMU_init_hw(void)
#define LARGE_PAGE_SIZE_16M (1<<24) #define LARGE_PAGE_SIZE_16M (1<<24)
#define LARGE_PAGE_SIZE_4M (1<<22) #define LARGE_PAGE_SIZE_4M (1<<22)
unsigned long __init mmu_mapin_ram(void) unsigned long __init mmu_mapin_ram(unsigned long top)
{ {
unsigned long v, s, mapped; unsigned long v, s, mapped;
phys_addr_t p; phys_addr_t p;
......
...@@ -88,7 +88,7 @@ void __init MMU_init_hw(void) ...@@ -88,7 +88,7 @@ void __init MMU_init_hw(void)
flush_instruction_cache(); flush_instruction_cache();
} }
unsigned long __init mmu_mapin_ram(void) unsigned long __init mmu_mapin_ram(unsigned long top)
{ {
unsigned long addr; unsigned long addr;
......
...@@ -156,7 +156,7 @@ void invalidate_tlbcam_entry(int index) ...@@ -156,7 +156,7 @@ void invalidate_tlbcam_entry(int index)
loadcam_entry(index); loadcam_entry(index);
} }
unsigned long __init mmu_mapin_ram(void) unsigned long __init mmu_mapin_ram(unsigned long top)
{ {
unsigned long virt = PAGE_OFFSET; unsigned long virt = PAGE_OFFSET;
phys_addr_t phys = memstart_addr; phys_addr_t phys = memstart_addr;
......
...@@ -150,15 +150,15 @@ extern void wii_memory_fixups(void); ...@@ -150,15 +150,15 @@ extern void wii_memory_fixups(void);
*/ */
#if defined(CONFIG_8xx) #if defined(CONFIG_8xx)
#define MMU_init_hw() do { } while(0) #define MMU_init_hw() do { } while(0)
#define mmu_mapin_ram() (0UL) #define mmu_mapin_ram(top) (0UL)
#elif defined(CONFIG_4xx) #elif defined(CONFIG_4xx)
extern void MMU_init_hw(void); 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) #elif defined(CONFIG_FSL_BOOKE)
extern void MMU_init_hw(void); 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); extern void adjust_total_lowmem(void);
#elif defined(CONFIG_PPC32) #elif defined(CONFIG_PPC32)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment