Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

Browse Source
This commit is contained in:
Paul Mackerras 2008-11-24 11:53:58 +11:00
commit be542fa56b
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/kernel/cpu_setup_44x.S
View File

@ -34,7 +34,12 @@ _GLOBAL(__setup_cpu_440grx)
blr blr
_GLOBAL(__setup_cpu_460ex) _GLOBAL(__setup_cpu_460ex)
_GLOBAL(__setup_cpu_460gt) _GLOBAL(__setup_cpu_460gt)
b __init_fpu_44x mflr r4
bl __init_fpu_44x
bl __fixup_440A_mcheck
mtlr r4
blr
_GLOBAL(__setup_cpu_440gx) _GLOBAL(__setup_cpu_440gx)
_GLOBAL(__setup_cpu_440spe) _GLOBAL(__setup_cpu_440spe)
b __fixup_440A_mcheck b __fixup_440A_mcheck

16
arch/powerpc/mm/40x_mmu.c
View File

@ -93,7 +93,7 @@ void __init MMU_init_hw(void)
unsigned long __init mmu_mapin_ram(void) unsigned long __init mmu_mapin_ram(void)
{ {
unsigned long v, s; unsigned long v, s, mapped;
phys_addr_t p; phys_addr_t p;
v = KERNELBASE; v = KERNELBASE;
@ -130,5 +130,17 @@ unsigned long __init mmu_mapin_ram(void)
s -= LARGE_PAGE_SIZE_4M; s -= LARGE_PAGE_SIZE_4M;
} }
return total_lowmem - s; mapped = total_lowmem - s;
/* If the size of RAM is not an exact power of two, we may not
* have covered RAM in its entirety with 16 and 4 MiB
* pages. Consequently, restrict the top end of RAM currently
* allocable so that calls to the LMB to allocate PTEs for "tail"
* coverage with normal-sized pages (or other reasons) do not
* attempt to allocate outside the allowed range.
*/
__initial_memory_limit_addr = memstart_addr + mapped;
return mapped;
} }