diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 10:58:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 10:58:23 -0700 |
| commit | b14f3bd90d2202a83f36eac85bcb3db0fba7d6a6 (patch) | |
| tree | bad35a2937e40ca211a70dbfbb5432b864eab724 /arch/powerpc/mm/init_32.c | |
| parent | 911e690e70540f009125bacd16c017eb1a7b1916 (diff) | |
| parent | 8b31e49d1d75729c1da9009664ba52abd1adc628 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.
powerpc: Minor cleanups of kernel virt address space definitions
powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm
Revert "powerpc: Rework dma-noncoherent to use generic vmalloc layer"
Diffstat (limited to 'arch/powerpc/mm/init_32.c')
| -rw-r--r-- | arch/powerpc/mm/init_32.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index 666a5e8a5be..3de6a0d9382 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -168,12 +168,8 @@ void __init MMU_init(void) ppc_md.progress("MMU:mapin", 0x301); mapin_ram(); -#ifdef CONFIG_HIGHMEM - ioremap_base = PKMAP_BASE; -#else - ioremap_base = 0xfe000000UL; /* for now, could be 0xfffff000 */ -#endif /* CONFIG_HIGHMEM */ - ioremap_bot = ioremap_base; + /* Initialize early top-down ioremap allocator */ + ioremap_bot = IOREMAP_TOP; /* Map in I/O resources */ if (ppc_md.progress) |