- updated vserver patch for 3.10.47

[packages/kernel.git] / kernel-vserver-2.3.patch

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index e025a12dcd347acd246b56368e94531aed938b66..815a2615929bd3ba8902f497d253f49a485f7615 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -14190,9 +14190,9 @@ diff -NurpP --minimal linux-3.10.40/kernel/fork.c linux-3.10.40-vs2.3.6.8/kernel
                        task_rlimit(p, RLIMIT_NPROC)) {
                if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
 @@ -1479,6 +1495,18 @@ static struct task_struct *copy_process(
- 
        total_forks++;
        spin_unlock(&current->sighand->siglock);
+       syscall_tracepoint_update(p);
 +
 +      /* p is copy of current */
 +      vxi = p->vx_info;
@@ -14206,8 +14206,8 @@ diff -NurpP --minimal linux-3.10.40/kernel/fork.c linux-3.10.40-vs2.3.6.8/kernel
 +      if (nxi)
 +              claim_nx_info(nxi, p);
        write_unlock_irq(&tasklist_lock);
+ 
        proc_fork_connector(p);
-       cgroup_post_fork(p);
 diff -NurpP --minimal linux-3.10.40/kernel/kthread.c linux-3.10.40-vs2.3.6.8/kernel/kthread.c
 --- linux-3.10.40/kernel/kthread.c     2013-07-14 17:01:35.000000000 +0000
 +++ linux-3.10.40-vs2.3.6.8/kernel/kthread.c   2013-08-22 21:14:28.000000000 +0000