This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9cb07d1..96b615c 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -30,7 +30,6 @@
 #include <linux/pid.h>
 #include <linux/percpu.h>
 #include <linux/topology.h>
-#include <linux/vs_base.h>
 
 struct exec_domain;
 extern int exec_shield;
@@ -950,28 +949,15 @@ static inline int sas_ss_flags(unsigned long sp)
 #ifdef CONFIG_SECURITY
 /* code is in security.c */
 extern int capable(int cap);
-extern int vx_capable(int cap, int ccap);
 #else
 static inline int capable(int cap)
 {
-       if (vx_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
-               return 0;
        if (cap_raised(current->cap_effective, cap)) {
                current->flags |= PF_SUPERPRIV;
                return 1;
        }
        return 0;
 }
-
-static inline int vx_capable(int cap, int ccap)
-{
-       if (cap_raised(current->cap_effective, cap) &&
-               vx_ccaps(ccap)) {
-               current->flags |= PF_SUPERPRIV;
-               return 1;
-       }
-       return 0;
-}
 #endif