git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
mm
/
mlock.c
diff --git
a/mm/mlock.c
b/mm/mlock.c
index
99e7709
..
288ee01
100644
(file)
--- a/
mm/mlock.c
+++ b/
mm/mlock.c
@@
-67,7
+67,7
@@
success:
ret = make_pages_present(start, end);
}
- vx_vmlocked_sub(
vma->vm_
mm, pages);
+ vx_vmlocked_sub(mm, pages);
out:
if (ret == -ENOMEM)
ret = -EAGAIN;