iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: fix up for mmu_mapin_ram api change

Browse Source 
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>
This commit is contained in:
Stephen Rothwell 2009-12-14 09:04:24 -07:00 committed by Grant Likely
parent c0577eeee0
commit ae4cec4736
4 changed files with 6 additions and 6 deletions

2
arch/powerpc/mm/40x_mmu.c

@ -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;

2
arch/powerpc/mm/44x_mmu.c

@ -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;

2
arch/powerpc/mm/fsl_booke_mmu.c

@ -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;

6
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)