diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-04-15 15:52:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-16 17:46:13 -0400 |
commit | 09b5e63f827016732d956abb7a4c74a312d20521 (patch) | |
tree | b79f8e6a7fa8173deab900995fa1af5929713588 | |
parent | edc164d18f6b86b6de134d432de286e6c440c66d (diff) |
[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: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/mm/fsl_booke_mmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/init_32.c | 10 | ||||
-rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/ppc_mmu_32.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index 59f6649ae42a..ada249bf9779 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c | |||
@@ -227,5 +227,5 @@ adjust_total_lowmem(void) | |||
227 | __cam0 >> 20, __cam1 >> 20, __cam2 >> 20, | 227 | __cam0 >> 20, __cam1 >> 20, __cam2 >> 20, |
228 | (total_lowmem - __cam0 - __cam1 - __cam2) >> 20); | 228 | (total_lowmem - __cam0 - __cam1 - __cam2) >> 20); |
229 | __max_low_memory = __cam0 + __cam1 + __cam2; | 229 | __max_low_memory = __cam0 + __cam1 + __cam2; |
230 | __initial_memory_limit = memstart_addr + __max_low_memory; | 230 | __initial_memory_limit_addr = memstart_addr + __max_low_memory; |
231 | } | 231 | } |
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index ba61d088d2a2..9a0ea2cbf911 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c | |||
@@ -95,10 +95,10 @@ int __map_without_ltlbs; | |||
95 | unsigned long __max_low_memory = MAX_LOW_MEM; | 95 | unsigned long __max_low_memory = MAX_LOW_MEM; |
96 | 96 | ||
97 | /* | 97 | /* |
98 | * limit of what is accessible with initial MMU setup - | 98 | * address of the limit of what is accessible with initial MMU setup - |
99 | * 256MB usually, but only 16MB on 601. | 99 | * 256MB usually, but only 16MB on 601. |
100 | */ | 100 | */ |
101 | unsigned long __initial_memory_limit = 0x10000000; | 101 | phys_addr_t __initial_memory_limit_addr = (phys_addr_t)0x10000000; |
102 | 102 | ||
103 | /* | 103 | /* |
104 | * Check for command-line options that affect what MMU_init will do. | 104 | * Check for command-line options that affect what MMU_init will do. |
@@ -131,10 +131,10 @@ void __init MMU_init(void) | |||
131 | 131 | ||
132 | /* 601 can only access 16MB at the moment */ | 132 | /* 601 can only access 16MB at the moment */ |
133 | if (PVR_VER(mfspr(SPRN_PVR)) == 1) | 133 | if (PVR_VER(mfspr(SPRN_PVR)) == 1) |
134 | __initial_memory_limit = 0x01000000; | 134 | __initial_memory_limit_addr = 0x01000000; |
135 | /* 8xx can only access 8MB at the moment */ | 135 | /* 8xx can only access 8MB at the moment */ |
136 | if (PVR_VER(mfspr(SPRN_PVR)) == 0x50) | 136 | if (PVR_VER(mfspr(SPRN_PVR)) == 0x50) |
137 | __initial_memory_limit = 0x00800000; | 137 | __initial_memory_limit_addr = 0x00800000; |
138 | 138 | ||
139 | /* parse args from command line */ | 139 | /* parse args from command line */ |
140 | MMU_setup(); | 140 | MMU_setup(); |
@@ -209,7 +209,7 @@ void __init *early_get_page(void) | |||
209 | p = alloc_bootmem_pages(PAGE_SIZE); | 209 | p = alloc_bootmem_pages(PAGE_SIZE); |
210 | } else { | 210 | } else { |
211 | p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE, | 211 | p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE, |
212 | __initial_memory_limit)); | 212 | __initial_memory_limit_addr)); |
213 | } | 213 | } |
214 | return p; | 214 | return p; |
215 | } | 215 | } |
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 67477e772958..04802252a64f 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h | |||
@@ -48,7 +48,7 @@ extern unsigned int num_tlbcam_entries; | |||
48 | 48 | ||
49 | extern unsigned long ioremap_bot; | 49 | extern unsigned long ioremap_bot; |
50 | extern unsigned long __max_low_memory; | 50 | extern unsigned long __max_low_memory; |
51 | extern unsigned long __initial_memory_limit; | 51 | extern phys_addr_t __initial_memory_limit_addr; |
52 | extern unsigned long total_memory; | 52 | extern unsigned long total_memory; |
53 | extern unsigned long total_lowmem; | 53 | extern unsigned long total_lowmem; |
54 | extern phys_addr_t memstart_addr; | 54 | extern phys_addr_t memstart_addr; |
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c index 65f915cbd29c..cef9f156874b 100644 --- a/arch/powerpc/mm/ppc_mmu_32.c +++ b/arch/powerpc/mm/ppc_mmu_32.c | |||
@@ -233,7 +233,7 @@ void __init MMU_init_hw(void) | |||
233 | */ | 233 | */ |
234 | if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322); | 234 | if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322); |
235 | Hash = __va(lmb_alloc_base(Hash_size, Hash_size, | 235 | Hash = __va(lmb_alloc_base(Hash_size, Hash_size, |
236 | __initial_memory_limit)); | 236 | __initial_memory_limit_addr)); |
237 | cacheable_memzero(Hash, Hash_size); | 237 | cacheable_memzero(Hash, Hash_size); |
238 | _SDR1 = __pa(Hash) | SDR1_LOW_BITS; | 238 | _SDR1 = __pa(Hash) | SDR1_LOW_BITS; |
239 | 239 | ||