vserver 1.9.3

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

diff --git a/kernel/capability.c b/kernel/capability.c
index 1c5c357..7d419fd 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/security.h>
+#include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
@@ -89,14 +90,12 @@ static inline void cap_set_pg(int pgrp, kernel_cap_t *effective,
                              kernel_cap_t *permitted)
 {
        task_t *g, *target;
-       struct list_head *l;
-       struct pid *pid;
 
-       for_each_task_pid(pgrp, PIDTYPE_PGID, g, l, pid) {
+       do_each_task_pid(pgrp, PIDTYPE_PGID, g) {
                target = g;
                while_each_thread(g, target)
                        security_capset_set(target, effective, inheritable, permitted);
-       }
+       } while_each_task_pid(pgrp, PIDTYPE_PGID, g);
 }
 
 /*