ksm: fix deadlock with munlock in exit_mmap

[mv-sheeva.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index e02f1aa66a1a8176aa953152bf40bc4112e3f26c..ffd6c6c9bcf4dbc30f2af472574e56b2326d7488 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2113,13 +2113,6 @@ void exit_mmap(struct mm_struct *mm)
        end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL);
        vm_unacct_memory(nr_accounted);
 
-       /*
-        * For KSM to handle OOM without deadlock when it's breaking COW in a
-        * likely victim of the OOM killer, we must serialize with ksm_exit()
-        * after freeing mm's pages but before freeing its page tables.
-        */
-       ksm_exit(mm, &tlb, end);
-
        free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
        tlb_finish_mmu(tlb, 0, end);