diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2012-07-29 15:32:14 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-15 17:11:15 -0700 |
| commit | a119ed4c1e0a0ffb650dd77c5d5f1b71378328c8 (patch) | |
| tree | f093093fb8fc61abe0b74bf83a68d86765f72d95 /arch/arm/mm/mmu.c | |
| parent | 51efb6b201d3a0939e684ef2b530fe485da32531 (diff) | |
mm: Avoid freeing init and initrd memory when CPA is enabled.
Align memblock reserve for text area to PMD size.
Reserve the memory hole between DRAM start and Page table start.
Add Sanity check to avoid section split in text area.
Bug 1028787
Change-Id: I586e4ad6e3a94aa0c79b302e51156dbe089e481f
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/121883
(cherry picked from commit 65d02640b4b0b38263687c7f3e664c873237dc43)
Reviewed-on: http://git-master/r/123431
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mm/mmu.c')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index bb80555edac9..992bbc52938c 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -942,7 +942,7 @@ void __init arm_mm_memblock_reserve(void) */ memblock_reserve(__pa(swapper_pg_dir), PTRS_PER_PGD * sizeof(pgd_t)); -#ifdef CONFIG_SA1111 +#if defined(CONFIG_SA1111) || defined(CONFIG_CPA) /* * Because of the SA1111 DMA bug, we want to preserve our * precious DMA-able memory... |