Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index a87239d..8d53d8f 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -29,6 +29,7 @@
 #include <linux/tty.h>
 #include <linux/signal.h>
 #include <linux/cn_proc.h>
+#include <linux/vs_base.h>
 #include <linux/vs_cvirt.h>
 
 #include <linux/compat.h>
@@ -1290,7 +1291,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
        if (!thread_group_leader(p))
                goto out;
 
-       if (p->parent == group_leader) {
+       if (p->real_parent == group_leader) {
                err = -EPERM;
                if (p->signal->session != group_leader->signal->session)
                        goto out;