diff -NurpP linux-2.6.38-vs2.3.0.37-rc8.1/include/linux/vs_pid.h linux-2.6.38-vs2.3.0.37-rc8.2/include/linux/vs_pid.h --- linux-2.6.38-vs2.3.0.37-rc8.1/include/linux/vs_pid.h 2011-01-29 02:01:07.000000000 +0100 +++ linux-2.6.38-vs2.3.0.37-rc8.2/include/linux/vs_pid.h 2011-03-22 17:43:53.000000000 +0100 @@ -27,24 +27,6 @@ visible: #define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns) -#if 0 - -static inline -struct task_struct *vx_find_proc_task_by_pid(int pid) -{ - struct task_struct *task = find_task_by_real_pid(pid); - - if (task && !vx_proc_task_visible(task)) { - vxdprintk(VXD_CBIT(misc, 6), - "dropping task (find) %p[#%u,%u] for %p[#%u,%u]", - task, task->xid, task->pid, - current, current->xid, current->pid); - task = NULL; - } - return task; -} - -#endif static inline struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid) @@ -62,33 +44,6 @@ struct task_struct *vx_get_proc_task(str return task; } -#if 0 - -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(p); - - 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, 7), - "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]", - p, p->xid, p->pid, reaper, reaper->xid, reaper->pid); - return reaper; -} - -#endif - #else #warning duplicate inclusion