aboutsummaryrefslogtreecommitdiffstats
path: root/mm/nommu.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-23 00:41:14 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-12-23 00:41:14 -0700
commitcfb13c5db08c90311a5defdde9a0328ee788cca5 (patch)
tree842cb60d1d19b99e550fdbc653723e4b13e51ee5 /mm/nommu.c
parent4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff)
parent90a8a73c06cc32b609a880d48449d7083327e11a (diff)
downloadkernel_replicant_linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.gz
kernel_replicant_linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.bz2
kernel_replicant_linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.zip
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'mm/nommu.c')
-rw-r--r--mm/nommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index 3613517c7592..27a9ac588516 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1717,6 +1717,7 @@ void exit_mmap(struct mm_struct *mm)
mm->mmap = vma->vm_next;
delete_vma_from_mm(vma);
delete_vma(mm, vma);
+ cond_resched();
}
kleave("");