diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /mm/memory.c | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 22bfa7a47a0b..baa999e87cd2 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1999,7 +1999,7 @@ gotten: | |||
| 1999 | * Don't let another task, with possibly unlocked vma, | 1999 | * Don't let another task, with possibly unlocked vma, |
| 2000 | * keep the mlocked page. | 2000 | * keep the mlocked page. |
| 2001 | */ | 2001 | */ |
| 2002 | if (vma->vm_flags & VM_LOCKED) { | 2002 | if ((vma->vm_flags & VM_LOCKED) && old_page) { |
| 2003 | lock_page(old_page); /* for LRU manipulation */ | 2003 | lock_page(old_page); /* for LRU manipulation */ |
| 2004 | clear_page_mlock(old_page); | 2004 | clear_page_mlock(old_page); |
| 2005 | unlock_page(old_page); | 2005 | unlock_page(old_page); |