Commit 09b5e63f authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[POWERPC] Rename __initial_memory_limit to __initial_memory_limit_addr 



We always use __initial_memory_limit as an address so rename it
to be clear.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent edc164d1

arch/powerpc/mm/fsl_booke_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -227,5 +227,5 @@ adjust_total_lowmem(void) 
			__cam0 >> 20, __cam1 >> 20, __cam2 >> 20,

			(total_lowmem - __cam0 - __cam1 - __cam2) >> 20);

	__max_low_memory = __cam0 + __cam1 + __cam2;

	__initial_memory_limit = memstart_addr + __max_low_memory;

	__initial_memory_limit_addr = memstart_addr + __max_low_memory;

}

arch/powerpc/mm/init_32.c

+5 −5
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ int __map_without_ltlbs; 
unsigned long __max_low_memory = MAX_LOW_MEM;



/*

 * limit of what is accessible with initial MMU setup -

 * address of the limit of what is accessible with initial MMU setup -

 * 256MB usually, but only 16MB on 601.

 */

unsigned long __initial_memory_limit = 0x10000000;

phys_addr_t __initial_memory_limit_addr = (phys_addr_t)0x10000000;



/*

 * Check for command-line options that affect what MMU_init will do.
@@ -131,10 +131,10 @@ void __init MMU_init(void) 


	/* 601 can only access 16MB at the moment */

	if (PVR_VER(mfspr(SPRN_PVR)) == 1)

		__initial_memory_limit = 0x01000000;

		__initial_memory_limit_addr = 0x01000000;

	/* 8xx can only access 8MB at the moment */

	if (PVR_VER(mfspr(SPRN_PVR)) == 0x50)

		__initial_memory_limit = 0x00800000;

		__initial_memory_limit_addr = 0x00800000;



	/* parse args from command line */

	MMU_setup();
@@ -209,7 +209,7 @@ void __init *early_get_page(void) 
		p = alloc_bootmem_pages(PAGE_SIZE);

	} else {

		p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,

					__initial_memory_limit));

					__initial_memory_limit_addr));

	}

	return p;

}

arch/powerpc/mm/mmu_decl.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ extern unsigned int num_tlbcam_entries; 


extern unsigned long ioremap_bot;

extern unsigned long __max_low_memory;

extern unsigned long __initial_memory_limit;

extern phys_addr_t __initial_memory_limit_addr;

extern unsigned long total_memory;

extern unsigned long total_lowmem;

extern phys_addr_t memstart_addr;

arch/powerpc/mm/ppc_mmu_32.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void __init MMU_init_hw(void) 
	 */

	if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);

	Hash = __va(lmb_alloc_base(Hash_size, Hash_size,

				   __initial_memory_limit));

				   __initial_memory_limit_addr));

	cacheable_memzero(Hash, Hash_size);

	_SDR1 = __pa(Hash) | SDR1_LOW_BITS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE