cleaning up after merge

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

diff --git a/include/linux/vs_cvirt.h b/include/linux/vs_cvirt.h
index 3158d5a..8275f53 100644 (file)
--- a/include/linux/vs_cvirt.h
+++ b/include/linux/vs_cvirt.h
@@ -108,7 +108,7 @@ struct inode;
 #define VXF_FAKE_INIT  (VXF_INFO_INIT|VXF_STATE_INIT)
 
 static inline
-int proc_pid_visible(struct task_struct *task, int pid)
+int vx_proc_pid_visible(struct task_struct *task, int pid)
 {
        if ((pid == 1) &&
                !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
@@ -122,11 +122,11 @@ visible:
 }
 
 static inline
-struct task_struct *find_proc_task_by_pid(int pid)
+struct task_struct *vx_find_proc_task_by_pid(int pid)
 {
        struct task_struct *task = find_task_by_pid(pid);
 
-       if (task && !proc_pid_visible(task, pid)) {
+       if (task && !vx_proc_pid_visible(task, pid)) {
                vxdprintk(VXD_CBIT(misc, 6),
                        "dropping task %p[#%u,%u] for %p[#%u,%u]",
                        task, task->xid, task->pid,
@@ -141,7 +141,7 @@ struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
 {
        struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
 
-       if (task && !proc_pid_visible(task, pid->nr)) {
+       if (task && !vx_proc_pid_visible(task, pid->nr)) {
                vxdprintk(VXD_CBIT(misc, 6),
                        "dropping task %p[#%u,%u] for %p[#%u,%u]",
                        task, task->xid, task->pid,