printk: fix wrong format string iter for printk

[pandora-kernel.git] / include / linux / selinux.h

diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index 8c2cc4c..20f965d 100644 (file)
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -16,98 +16,10 @@
 
 struct selinux_audit_rule;
 struct audit_context;
-struct inode;
 struct kern_ipc_perm;
 
 #ifdef CONFIG_SECURITY_SELINUX
 
-/**
- *     selinux_audit_rule_init - alloc/init an selinux audit rule structure.
- *     @field: the field this rule refers to
- *     @op: the operater the rule uses
- *     @rulestr: the text "target" of the rule
- *     @rule: pointer to the new rule structure returned via this
- *
- *     Returns 0 if successful, -errno if not.  On success, the rule structure
- *     will be allocated internally.  The caller must free this structure with
- *     selinux_audit_rule_free() after use.
- */
-int selinux_audit_rule_init(u32 field, u32 op, char *rulestr,
-                            struct selinux_audit_rule **rule);
-
-/**
- *     selinux_audit_rule_free - free an selinux audit rule structure.
- *     @rule: pointer to the audit rule to be freed
- *
- *     This will free all memory associated with the given rule.
- *     If @rule is NULL, no operation is performed.
- */
-void selinux_audit_rule_free(struct selinux_audit_rule *rule);
-
-/**
- *     selinux_audit_rule_match - determine if a context ID matches a rule.
- *     @sid: the context ID to check
- *     @field: the field this rule refers to
- *     @op: the operater the rule uses
- *     @rule: pointer to the audit rule to check against
- *     @actx: the audit context (can be NULL) associated with the check
- *
- *     Returns 1 if the context id matches the rule, 0 if it does not, and
- *     -errno on failure.
- */
-int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
-                             struct selinux_audit_rule *rule,
-                             struct audit_context *actx);
-
-/**
- *     selinux_audit_set_callback - set the callback for policy reloads.
- *     @callback: the function to call when the policy is reloaded
- *
- *     This sets the function callback function that will update the rules
- *     upon policy reloads.  This callback should rebuild all existing rules
- *     using selinux_audit_rule_init().
- */
-void selinux_audit_set_callback(int (*callback)(void));
-
-/**
- *     selinux_sid_to_string - map a security context ID to a string
- *     @sid: security context ID to be converted.
- *     @ctx: address of context string to be returned
- *     @ctxlen: length of returned context string.
- *
- *     Returns 0 if successful, -errno if not.  On success, the context
- *     string will be allocated internally, and the caller must call
- *     kfree() on it after use.
- */
-int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen);
-
-/**
- *     selinux_get_inode_sid - get the inode's security context ID
- *     @inode: inode structure to get the sid from.
- *     @sid: pointer to security context ID to be filled in.
- *
- *     Returns nothing
- */
-void selinux_get_inode_sid(const struct inode *inode, u32 *sid);
-
-/**
- *     selinux_get_ipc_sid - get the ipc security context ID
- *     @ipcp: ipc structure to get the sid from.
- *     @sid: pointer to security context ID to be filled in.
- *
- *     Returns nothing
- */
-void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid);
-
-/**
- *     selinux_get_task_sid - return the SID of task
- *     @tsk: the task whose SID will be returned
- *     @sid: pointer to security context ID to be filled in.
- *
- *     Returns nothing
- */
-void selinux_get_task_sid(struct task_struct *tsk, u32 *sid);
-
 /**
  *     selinux_string_to_sid - map a security context string to a security ID
  *     @str: the security context string to be mapped
@@ -151,52 +63,6 @@ void selinux_secmark_refcount_inc(void);
 void selinux_secmark_refcount_dec(void);
 #else
 
-static inline int selinux_audit_rule_init(u32 field, u32 op,
-                                          char *rulestr,
-                                          struct selinux_audit_rule **rule)
-{
-       return -EOPNOTSUPP;
-}
-
-static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule)
-{
-       return;
-}
-
-static inline int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
-                                           struct selinux_audit_rule *rule,
-                                           struct audit_context *actx)
-{
-       return 0;
-}
-
-static inline void selinux_audit_set_callback(int (*callback)(void))
-{
-       return;
-}
-
-static inline int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen)
-{
-       *ctx = NULL;
-       *ctxlen = 0;
-       return 0;
-}
-
-static inline void selinux_get_inode_sid(const struct inode *inode, u32 *sid)
-{
-       *sid = 0;
-}
-
-static inline void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid)
-{
-       *sid = 0;
-}
-
-static inline void selinux_get_task_sid(struct task_struct *tsk, u32 *sid)
-{
-       *sid = 0;
-}
-
 static inline int selinux_string_to_sid(const char *str, u32 *sid)
 {
        *sid = 0;