linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/kernel/capability.c b/kernel/capability.c
index 6b3412f..14d1f1f 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -14,6 +14,7 @@
 #include <linux/syscalls.h>
 #include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>
+#include <linux/vs_base.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
 kernel_cap_t cap_bset = CAP_INIT_EFF_SET;
@@ -234,22 +235,3 @@ out:
 
      return ret;
 }
-
-int __capable(struct task_struct *t, int cap)
-{
-       if (security_capable(t, cap) == 0) {
-               t->flags |= PF_SUPERPRIV;
-               return 1;
-       }
-       return 0;
-}
-EXPORT_SYMBOL(__capable);
-
-int capable(int cap)
-{
-       /* here for now so we don't require task locking */
-       if (vx_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
-               return 0;
-       return __capable(current, cap);
-}
-EXPORT_SYMBOL(capable);