diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/ia64/include/asm/tlb.h linux-3.1.4-vs2.3.2.3/arch/ia64/include/asm/tlb.h --- linux-3.1.4-vs2.3.2.2/arch/ia64/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/ia64/include/asm/tlb.h 2011-12-07 04:18:32.000000000 +0100 @@ -40,7 +40,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/ia64/kernel/perfmon.c linux-3.1.4-vs2.3.2.3/arch/ia64/kernel/perfmon.c --- linux-3.1.4-vs2.3.2.2/arch/ia64/kernel/perfmon.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/ia64/kernel/perfmon.c 2011-12-07 04:18:37.000000000 +0100 @@ -42,7 +42,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/ia64/mm/fault.c linux-3.1.4-vs2.3.2.3/arch/ia64/mm/fault.c --- linux-3.1.4-vs2.3.2.2/arch/ia64/mm/fault.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/ia64/mm/fault.c 2011-12-07 04:18:41.000000000 +0100 @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/powerpc/kernel/vdso.c linux-3.1.4-vs2.3.2.3/arch/powerpc/kernel/vdso.c --- linux-3.1.4-vs2.3.2.2/arch/powerpc/kernel/vdso.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/powerpc/kernel/vdso.c 2011-12-07 04:18:45.000000000 +0100 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/s390/include/asm/tlb.h linux-3.1.4-vs2.3.2.3/arch/s390/include/asm/tlb.h --- linux-3.1.4-vs2.3.2.2/arch/s390/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/s390/include/asm/tlb.h 2011-12-07 04:18:50.000000000 +0100 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/sh/kernel/vsyscall/vsyscall.c linux-3.1.4-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c --- linux-3.1.4-vs2.3.2.2/arch/sh/kernel/vsyscall/vsyscall.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/sh/kernel/vsyscall/vsyscall.c 2011-12-07 04:18:54.000000000 +0100 @@ -18,7 +18,6 @@ #include #include #include -#include /* * Should the kernel map a VDSO page into processes and pass its diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/sparc/include/asm/tlb_64.h linux-3.1.4-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h --- linux-3.1.4-vs2.3.2.2/arch/sparc/include/asm/tlb_64.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/sparc/include/asm/tlb_64.h 2011-12-07 04:18:59.000000000 +0100 @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/arch/um/include/asm/tlb.h linux-3.1.4-vs2.3.2.3/arch/um/include/asm/tlb.h --- linux-3.1.4-vs2.3.2.2/arch/um/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/arch/um/include/asm/tlb.h 2011-12-07 04:19:04.000000000 +0100 @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.1.4-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c --- linux-3.1.4-vs2.3.2.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-12-07 04:19:08.000000000 +0100 @@ -35,7 +35,6 @@ #include #include #include -#include #include "ipath_kernel.h" diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/fs/binfmt_aout.c linux-3.1.4-vs2.3.2.3/fs/binfmt_aout.c --- linux-3.1.4-vs2.3.2.2/fs/binfmt_aout.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/fs/binfmt_aout.c 2011-12-07 04:19:12.000000000 +0100 @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/fs/binfmt_elf.c linux-3.1.4-vs2.3.2.3/fs/binfmt_elf.c --- linux-3.1.4-vs2.3.2.2/fs/binfmt_elf.c 2011-11-15 17:08:44.000000000 +0100 +++ linux-3.1.4-vs2.3.2.3/fs/binfmt_elf.c 2011-12-07 04:19:18.000000000 +0100 @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/fs/binfmt_flat.c linux-3.1.4-vs2.3.2.3/fs/binfmt_flat.c --- linux-3.1.4-vs2.3.2.2/fs/binfmt_flat.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/fs/binfmt_flat.c 2011-12-07 04:19:22.000000000 +0100 @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/fs/binfmt_som.c linux-3.1.4-vs2.3.2.3/fs/binfmt_som.c --- linux-3.1.4-vs2.3.2.2/fs/binfmt_som.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/fs/binfmt_som.c 2011-12-07 04:19:26.000000000 +0100 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/include/asm-generic/tlb.h linux-3.1.4-vs2.3.2.3/include/asm-generic/tlb.h --- linux-3.1.4-vs2.3.2.2/include/asm-generic/tlb.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/include/asm-generic/tlb.h 2011-12-07 04:19:31.000000000 +0100 @@ -16,7 +16,6 @@ #define _ASM_GENERIC__TLB_H #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/include/linux/vs_memory.h linux-3.1.4-vs2.3.2.3/include/linux/vs_memory.h --- linux-3.1.4-vs2.3.2.2/include/linux/vs_memory.h 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -#ifndef _VS_MEMORY_H -#define _VS_MEMORY_H - -#include "vserver/limit.h" -#include "vserver/base.h" -#include "vserver/context.h" -#include "vserver/debug.h" -#include "vserver/context.h" -#include "vserver/limit_int.h" - -enum { - VXPT_UNKNOWN = 0, - VXPT_ANON, - VXPT_NONE, - VXPT_FILE, - VXPT_SWAP, - VXPT_WRITE -}; - -#if 0 -#define vx_page_fault(mm, vma, type, ret) -#else - -static inline -void __vx_page_fault(struct mm_struct *mm, - struct vm_area_struct *vma, int type, int ret) -{ - struct vx_info *vxi = mm->mm_vx_info; - int what; -/* - static char *page_type[6] = - { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" }; - static char *page_what[4] = - { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" }; -*/ - - if (!vxi) - return; - - what = (ret & 0x3); - -/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id, - type, what, ret, page_type[type], page_what[what]); -*/ - if (ret & VM_FAULT_WRITE) - what |= 0x4; - atomic_inc(&vxi->cacct.page[type][what]); -} - -#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret) -#endif - - -extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm); - -#else -#warning duplicate inclusion -#endif diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/kernel/fork.c linux-3.1.4-vs2.3.2.3/kernel/fork.c --- linux-3.1.4-vs2.3.2.2/kernel/fork.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/kernel/fork.c 2011-12-07 04:19:36.000000000 +0100 @@ -69,7 +69,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/kernel/vserver/limit.c linux-3.1.4-vs2.3.2.3/kernel/vserver/limit.c --- linux-3.1.4-vs2.3.2.2/kernel/vserver/limit.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/kernel/vserver/limit.c 2011-12-07 04:10:54.000000000 +0100 @@ -339,22 +339,3 @@ long vx_vsi_cached(struct sysinfo *val) #endif } - -unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm) -{ - struct vx_info *vxi = mm->mm_vx_info; - unsigned long points; - rlim_t v, w; - - if (!vxi) - return 0; - - points = vxi->vx_badness_bias; - - v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS); - w = __rlim_soft(&vxi->limit, RLIMIT_RSS); - points += (v > w) ? (v - w) : 0; - - return points; -} - diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/filemap_xip.c linux-3.1.4-vs2.3.2.3/mm/filemap_xip.c --- linux-3.1.4-vs2.3.2.2/mm/filemap_xip.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/filemap_xip.c 2011-12-07 04:19:40.000000000 +0100 @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/fremap.c linux-3.1.4-vs2.3.2.3/mm/fremap.c --- linux-3.1.4-vs2.3.2.2/mm/fremap.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/fremap.c 2011-12-07 04:19:44.000000000 +0100 @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/hugetlb.c linux-3.1.4-vs2.3.2.3/mm/hugetlb.c --- linux-3.1.4-vs2.3.2.2/mm/hugetlb.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/hugetlb.c 2011-12-07 04:19:49.000000000 +0100 @@ -28,7 +28,6 @@ #include #include -#include #include "internal.h" const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/memory.c linux-3.1.4-vs2.3.2.3/mm/memory.c --- linux-3.1.4-vs2.3.2.2/mm/memory.c 2011-11-15 17:08:44.000000000 +0100 +++ linux-3.1.4-vs2.3.2.3/mm/memory.c 2011-12-07 04:26:22.000000000 +0100 @@ -3389,7 +3389,6 @@ int handle_pte_fault(struct mm_struct *m { pte_t entry; spinlock_t *ptl; - int ret = 0, type = VXPT_UNKNOWN; entry = *pte; if (!pte_present(entry)) { @@ -3414,12 +3413,9 @@ int handle_pte_fault(struct mm_struct *m if (unlikely(!pte_same(*pte, entry))) goto unlock; if (flags & FAULT_FLAG_WRITE) { - if (!pte_write(entry)) { - ret = do_wp_page(mm, vma, address, + if (!pte_write(entry)) + return do_wp_page(mm, vma, address, pte, pmd, ptl, entry); - type = VXPT_WRITE; - goto out; - } entry = pte_mkdirty(entry); } entry = pte_mkyoung(entry); @@ -3437,10 +3433,7 @@ int handle_pte_fault(struct mm_struct *m } unlock: pte_unmap_unlock(pte, ptl); - ret = 0; -out: - vx_page_fault(mm, vma, type, ret); - return ret; + return 0; } /* diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/mremap.c linux-3.1.4-vs2.3.2.3/mm/mremap.c --- linux-3.1.4-vs2.3.2.2/mm/mremap.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/mremap.c 2011-12-07 04:20:07.000000000 +0100 @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/oom_kill.c linux-3.1.4-vs2.3.2.3/mm/oom_kill.c --- linux-3.1.4-vs2.3.2.2/mm/oom_kill.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/oom_kill.c 2011-12-07 04:20:11.000000000 +0100 @@ -33,7 +33,6 @@ #include #include #include -#include #include int sysctl_panic_on_oom; @@ -224,18 +223,6 @@ unsigned int oom_badness(struct task_str points += p->signal->oom_score_adj; /* - * add points for context badness and - * reduce badness for processes belonging to - * a different context - */ - - points += vx_badness(p, p->mm); - - if ((vx_current_xid() > 1) && - vx_current_xid() != vx_task_xid(p)) - points /= 16; - - /* * Never return 0 for an eligible task that may be killed since it's * possible that no single user task uses more than 0.1% of memory and * no single admin tasks uses more than 3.0%. diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/rmap.c linux-3.1.4-vs2.3.2.3/mm/rmap.c --- linux-3.1.4-vs2.3.2.2/mm/rmap.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/rmap.c 2011-12-07 04:20:16.000000000 +0100 @@ -56,7 +56,6 @@ #include #include #include -#include #include diff -NurpP --minimal linux-3.1.4-vs2.3.2.2/mm/swapfile.c linux-3.1.4-vs2.3.2.3/mm/swapfile.c --- linux-3.1.4-vs2.3.2.2/mm/swapfile.c 2011-10-24 18:53:33.000000000 +0200 +++ linux-3.1.4-vs2.3.2.3/mm/swapfile.c 2011-12-07 04:20:21.000000000 +0100 @@ -38,7 +38,6 @@ #include #include #include -#include static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char);