- sync vserver branch: will help future merges

diff --git a/kernel/printk.c b/kernel/printk.c
index a31297d..cc44340 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -30,7 +30,6 @@
 #include <linux/smp.h>
 #include <linux/security.h>
 #include <linux/bootmem.h>
-#include <linux/vs_base.h>
 #include <linux/syscalls.h>
 #include <linux/vserver/cvirt.h>
 

diff --git a/kernel/signal.c b/kernel/signal.c
index 4d15dd4..a001981 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2040,6 +2040,7 @@ EXPORT_SYMBOL(sigprocmask);
 EXPORT_SYMBOL(block_all_signals);
 EXPORT_SYMBOL(unblock_all_signals);
 
+
 /*
  * System call entry points.
  */

diff --git a/kernel/vserver/helper.c b/kernel/vserver/helper.c
index 57215f8..90451fa 100644 (file)
--- a/kernel/vserver/helper.c
+++ b/kernel/vserver/helper.c
@@ -135,6 +135,7 @@ long vs_state_change(struct vx_info *vxi, unsigned int cmd)
        return 0;
 }
 
+
 /*
  *      argv [0] = vshelper_path;
  *      argv [1] = action: "netup", "netdown"

diff --git a/mm/fremap.c b/mm/fremap.c
index 8a0c312..30a11a6 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -14,7 +14,6 @@
 #include <linux/swapops.h>
 #include <linux/rmap.h>
 #include <linux/module.h>
-#include <linux/vs_memory.h>
 #include <linux/syscalls.h>
 #include <linux/vs_memory.h>
 
@@ -69,9 +68,6 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
        pgd = pgd_offset(mm, addr);
        spin_lock(&mm->page_table_lock);
-
-       if (!vx_rsspages_avail(mm, 1))
-               goto err_unlock;
        
        if (!vx_rsspages_avail(mm, 1))
                goto err_unlock;

diff --git a/mm/mmap.c b/mm/mmap.c
index 938dd62..fe4d9b7 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1020,10 +1020,6 @@ munmap_back:
        if (!may_expand_vm(mm, len >> PAGE_SHIFT))
                return -ENOMEM;
 
-       /* check context space, maybe only Private writable mapping? */
-       if (!vx_vmpages_avail(mm, len >> PAGE_SHIFT))
-               return -ENOMEM;
-
        if (accountable && (!(flags & MAP_NORESERVE) ||
                            sysctl_overcommit_memory == OVERCOMMIT_NEVER)) {
                if (vm_flags & VM_SHARED) {
@@ -1529,9 +1525,6 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
                        return -ENOMEM;
        }
 
-       if (!vx_vmpages_avail(vma->vm_mm, grow))
-               return -ENOMEM;
-
        /*
         * Overcommit..  This must be the final test, as it will
         * update security statistics.
@@ -1956,8 +1949,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
        if (mm->map_count > sysctl_max_map_count)
                return -ENOMEM;
 
-       if (security_vm_enough_memory(len >> PAGE_SHIFT) ||
-               !vx_vmpages_avail(mm, len >> PAGE_SHIFT))
+       if (security_vm_enough_memory(len >> PAGE_SHIFT))
                return -ENOMEM;
 
        flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;