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 de32400dd2
("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>
This commit is contained in:
parent
c0577eeee0
commit
ae4cec4736
|
@ -91,7 +91,7 @@ void __init MMU_init_hw(void)
|
|||
#define LARGE_PAGE_SIZE_16M (1<<24)
|
||||
#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;
|
||||
phys_addr_t p;
|
||||
|
|
|
@ -88,7 +88,7 @@ void __init MMU_init_hw(void)
|
|||
flush_instruction_cache();
|
||||
}
|
||||
|
||||
unsigned long __init mmu_mapin_ram(void)
|
||||
unsigned long __init mmu_mapin_ram(unsigned long top)
|
||||
{
|
||||
unsigned long addr;
|
||||
|
||||
|
|
|
@ -156,7 +156,7 @@ void invalidate_tlbcam_entry(int 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;
|
||||
phys_addr_t phys = memstart_addr;
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue