Changes in kernel/generic/include/security/cap.h [6b10dab:b3f8fb7] in mainline

File:

• kernel/generic/include/security/cap.h (modified) (6 diffs)

kernel/generic/include/security/cap.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */
@@ -35 +35 @@
 /**
  * @file
- * @brief Capabilities definitions.
+ * @brief       Capabilities definitions.
  *
  * Capabilities represent virtual rights that entitle their
@@ -48 +48 @@
 #define __CAP_H__
 
-#include <typedefs.h>
+#include <syscall/sysarg64.h>
+#include <arch/types.h>
 
 /**
@@ -54 +55 @@
  * privilege to/from other tasks.
  */
-#define CAP_CAP  (1 << 0)
+#define CAP_CAP                 (1<<0)
 
 /**
@@ -60 +61 @@
  * to other tasks.
  */
-#define CAP_MEM_MANAGER  (1 << 1)
+#define CAP_MEM_MANAGER         (1<<1)
 
 /**
@@ -66 +67 @@
  * to other tasks.
  */
-#define CAP_IO_MANAGER  (1 << 2)
+#define CAP_IO_MANAGER          (1<<2)
+
+/**
+ * CAP_PREEMPT_CONTROL allows its holder to disable/enable preemption.
+ */
+#define CAP_PREEMPT_CONTROL     (1<<3)
 
 /**
  * CAP_IRQ_REG entitles its holder to register IRQ handlers.
  */
-#define CAP_IRQ_REG  (1 << 3)
+#define CAP_IRQ_REG             (1<<4) 
 
 typedef uint32_t cap_t;
 
-#ifdef __32_BITS__
-
-extern sysarg_t sys_cap_grant(sysarg64_t *, cap_t);
-extern sysarg_t sys_cap_revoke(sysarg64_t *, cap_t);
-
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-extern sysarg_t sys_cap_grant(sysarg_t, cap_t);
-extern sysarg_t sys_cap_revoke(sysarg_t, cap_t);
-
-#endif  /* __64_BITS__ */
+extern unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
+extern unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
 
 #endif