From: Mark Huang Date: Sat, 20 Aug 2005 19:55:40 +0000 (+0000) Subject: - sync vserver branch: will help future merges X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~142 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=804f448fadfb16effa3f62acf9f171b0c774c306;p=linux-2.6.git - sync vserver branch: will help future merges --- diff --git a/kernel/printk.c b/kernel/printk.c index a31297d55..cc4434076 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/kernel/signal.c b/kernel/signal.c index 4d15dd42b..a001981bf 100644 --- 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 57215f820..90451fab7 100644 --- 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 8a0c3122f..30a11a6c7 100644 --- a/mm/fremap.c +++ b/mm/fremap.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -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 938dd6244..fe4d9b70b 100644 --- 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;