diff options
| author | Paul Mackerras | 2005-10-06 04:23:33 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-06 04:23:33 +0200 |
| commit | 7c8c6b9776fb41134d87ef50706a777a45d61cd4 (patch) | |
| tree | 5f3cc71e34bc244d53364e103a9746bfe92da9ae /arch/powerpc/mm/pgtable.c | |
| parent | powerpc: Merge in the ppc64 version of the prom code. (diff) | |
| download | kernel-qcow2-linux-7c8c6b9776fb41134d87ef50706a777a45d61cd4.tar.gz kernel-qcow2-linux-7c8c6b9776fb41134d87ef50706a777a45d61cd4.tar.xz kernel-qcow2-linux-7c8c6b9776fb41134d87ef50706a777a45d61cd4.zip | |
powerpc: Merge lmb.c and make MM initialization use it.
This also creates merged versions of do_init_bootmem, paging_init
and mem_init and moves them to arch/powerpc/mm/mem.c. It gets rid
of the mem_pieces stuff.
I made memory_limit a parameter to lmb_enforce_memory_limit rather
than a global referenced by that function. This will require some
small changes to ppc64 if we want to continue building ARCH=ppc64
using the merged lmb.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm/pgtable.c')
| -rw-r--r-- | arch/powerpc/mm/pgtable.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c index 81a3d7446d37..5792e533916f 100644 --- a/arch/powerpc/mm/pgtable.c +++ b/arch/powerpc/mm/pgtable.c @@ -190,8 +190,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) * Don't allow anybody to remap normal RAM that we're using. * mem_init() sets high_memory so only do the check after that. */ - if ( mem_init_done && (p < virt_to_phys(high_memory)) ) - { + if (mem_init_done && (p < virt_to_phys(high_memory))) { printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p, __builtin_return_address(0)); return NULL; |