diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-20 16:41:36 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-20 16:41:36 +0530 |
| commit | c20a9d34438ca68185ff27b680790f2eeb0a52ab (patch) | |
| tree | 24ff7e6cf9aa6dd4e54baa05c260ded5932bda36 /mm | |
| parent | ab8469437be95034d5da31d60bf2003e435285db (diff) | |
| parent | 4b35c24f445ecbdb88b2dfcf3b7ec57973464bfe (diff) | |
Merge remote-tracking branch 'cmarinas/master' into android-t114-3.4-rebased
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/proc-v7-2level.S
Change-Id: Id40c1d976a828e4fd3cde15c1b478fa2c42aeb2a
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 848ef52d9603..922de71fc759 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1920,7 +1920,7 @@ static void unmap_region(struct mm_struct *mm, unmap_vmas(&tlb, vma, start, end, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, - next ? next->vm_start : 0); + next ? next->vm_start : TASK_SIZE); tlb_finish_mmu(&tlb, start, end); } @@ -2308,7 +2308,7 @@ void exit_mmap(struct mm_struct *mm) unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL); vm_unacct_memory(nr_accounted); - free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); + free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, TASK_SIZE); tlb_finish_mmu(&tlb, 0, -1); /* |