Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/powerpc/mm/40x_mmu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

arch/powerpc/mm/44x_mmu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

arch/powerpc/mm/fsl_booke_mmu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

arch/powerpc/mm/mmu_decl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -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)