fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / vs_context.h

diff --git a/include/linux/vs_context.h b/include/linux/vs_context.h
index 51656ac..fe3d6db 100644 (file)
--- a/include/linux/vs_context.h
+++ b/include/linux/vs_context.h
@@ -1,7 +1,9 @@
-#ifndef _VX_VS_CONTEXT_H
-#define _VX_VS_CONTEXT_H
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
 
-#include <linux/kernel.h>
+#include "vserver/base.h"
+#include "vserver/context.h"
+#include "vserver/history.h"
 #include "vserver/debug.h"
 
 
@@ -213,30 +215,6 @@ extern void exit_vx_info(struct task_struct *, int);
 extern void exit_vx_info_early(struct task_struct *, int);
 
 
-static inline
-struct task_struct *vx_child_reaper(struct task_struct *p)
-{
-       struct vx_info *vxi = p->vx_info;
-       struct task_struct *reaper = child_reaper;
-
-       if (!vxi)
-               goto out;
-
-       BUG_ON(!p->vx_info->vx_reaper);
-
-       /* child reaper for the guest reaper */
-       if (vxi->vx_reaper == p)
-               goto out;
-
-       reaper = vxi->vx_reaper;
-out:
-       vxdprintk(VXD_CBIT(xid, 3),
-               "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]\n",
-               p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
-       return reaper;
-}
-
-
 #else
 #warning duplicate inclusion
 #endif