diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-07 07:49:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-07 07:49:51 +0100 |
| commit | 10a18d7dc0d9f12483c95ffc234118e9b80edfeb (patch) | |
| tree | 0f43620107d5231cab669bca4b3c923b721330c7 /mm/nommu.c | |
| parent | f984ba4eb575e4a27ed28a76d4126d2aa9233c32 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
| download | linux-stable-10a18d7dc0d9f12483c95ffc234118e9b80edfeb.tar.gz | |
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 1 |
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(""); |