summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J. Magnani <steve@digidescorp.com>2010-11-24 12:56:54 -0800
committerAndi Kleen <ak@linux.intel.com>2010-12-14 23:40:15 +0100
commita28c2bb7f58fad804d4673eb37b7c0436b945f15 (patch)
treee31f5e432b46a00b84262fd86ea9207dd46dbf53
parent7e8d53c0fad544ddb5f62bb6faf836ec04256608 (diff)
nommu: yield CPU while disposing VM
commit 04c3496152394d17e3bc2316f9731ee3e8a026bc upstream. Depending on processor speed, page size, and the amount of memory a process is allowed to amass, cleanup of a large VM may freeze the system for many seconds. This can result in a watchdog timeout. Make sure other tasks receive some service when cleaning up large VMs. Signed-off-by: Steven J. Magnani <steve@digidescorp.com> Cc: Greg Ungerer <gerg@snapgear.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/nommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index e48b38c521e4..3e1854887418 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1673,6 +1673,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("");