Add changes from the Linux-2.6 tree.

[linux-2.6.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 99e7709..ed63dcb 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -10,7 +10,6 @@
 #include <linux/mm.h>
 #include <linux/mempolicy.h>
 #include <linux/syscalls.h>
-#include <linux/vs_base.h>
 #include <linux/vs_memory.h>
 
 
@@ -67,7 +66,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;