diff options
| author | Joonsoo Kim <iamjoonsoo.kim@lge.com> | 2013-04-05 04:16:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-04-17 17:53:24 +0200 |
| commit | de40614e92bf1b0308d953387b0cb9d3a5710186 (patch) | |
| tree | 79acdd36b82452be003f02db7621e88656fe0aa7 /arch/arm/mm/mmu.c | |
| parent | ARM: 7692/1: iop3xx: move IOP3XX_PERIPHERAL_VIRT_BASE (diff) | |
| download | linux-de40614e92bf1b0308d953387b0cb9d3a5710186.tar.xz linux-de40614e92bf1b0308d953387b0cb9d3a5710186.zip | |
ARM: 7694/1: ARM, TCM: initialize TCM in paging_init(), instead of setup_arch()
tcm_init() call iotable_init() and it use early_alloc variants which
do memblock allocation. Directly using memblock allocation after
initializing bootmem should not permitted, because bootmem can't know
where are additinally reserved.
So move tcm_init() to a safe place before initalizing bootmem.
(On the U300)
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 78978945492a..a84ff763ac39 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -34,6 +34,7 @@ #include <asm/mach/pci.h> #include "mm.h" +#include "tcm.h" /* * empty_zero_page is a special page that is used for @@ -1277,6 +1278,7 @@ void __init paging_init(struct machine_desc *mdesc) dma_contiguous_remap(); devicemaps_init(mdesc); kmap_init(); + tcm_init(); top_pmd = pmd_off_k(0xffff0000); |