diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:20:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:20:35 +0200 |
| commit | f14eff1cc2f418a7c5e23aedc6a1bdca3343b871 (patch) | |
| tree | fd8d5f7ed2b2e94eff4007e8da0e9ed205d8d5c9 /mm/rmap.c | |
| parent | 84e9dabf6e6a78928c6a1a8ba235c9fb0908d0f8 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into sched/core
Merge reason: bump from rc5 to rc8, but also pick up TP_perf_assign()
API, a patch will be queued that depends on it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 836c6c63e1f..0895b5c7cbf 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -358,6 +358,7 @@ static int page_referenced_one(struct page *page, */ if (vma->vm_flags & VM_LOCKED) { *mapcount = 1; /* break early from loop */ + *vm_flags |= VM_LOCKED; goto out_unmap; } |