--- zzzz-none-000/linux-2.6.39.4/include/linux/security.h 2011-08-03 19:43:28.000000000 +0000 +++ puma6-atom-6490-729/linux-2.6.39.4/include/linux/security.h 2021-11-10 13:38:17.000000000 +0000 @@ -38,6 +38,9 @@ #include #include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" + /* Maximum number of letters for an LSM name string */ #define SECURITY_NAME_MAX 10 @@ -2780,63 +2783,63 @@ #else /* CONFIG_SECURITY_NETWORK_XFRM */ -static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx) +static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp __attribute__((unused)), struct xfrm_user_sec_ctx *sec_ctx __attribute__((unused))) { return 0; } -static inline int security_xfrm_policy_clone(struct xfrm_sec_ctx *old, struct xfrm_sec_ctx **new_ctxp) +static inline int security_xfrm_policy_clone(struct xfrm_sec_ctx *old __attribute__((unused)), struct xfrm_sec_ctx **new_ctxp __attribute__((unused))) { return 0; } -static inline void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx) +static inline void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx __attribute__((unused))) { } -static inline int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx) +static inline int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx __attribute__((unused))) { return 0; } -static inline int security_xfrm_state_alloc(struct xfrm_state *x, - struct xfrm_user_sec_ctx *sec_ctx) +static inline int security_xfrm_state_alloc(struct xfrm_state *x __attribute__((unused)), + struct xfrm_user_sec_ctx *sec_ctx __attribute__((unused))) { return 0; } -static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x, - struct xfrm_sec_ctx *polsec, u32 secid) +static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x __attribute__((unused)), + struct xfrm_sec_ctx *polsec __attribute__((unused)), u32 secid __attribute__((unused))) { return 0; } -static inline void security_xfrm_state_free(struct xfrm_state *x) +static inline void security_xfrm_state_free(struct xfrm_state *x __attribute__((unused))) { } -static inline int security_xfrm_state_delete(struct xfrm_state *x) +static inline int security_xfrm_state_delete(struct xfrm_state *x __attribute__((unused))) { return 0; } -static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) +static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx __attribute__((unused)), u32 fl_secid __attribute__((unused)), u8 dir __attribute__((unused))) { return 0; } -static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x, - struct xfrm_policy *xp, const struct flowi *fl) +static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x __attribute__((unused)), + struct xfrm_policy *xp __attribute__((unused)), const struct flowi *fl __attribute__((unused))) { return 1; } -static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid) +static inline int security_xfrm_decode_session(struct sk_buff *skb __attribute__((unused)), u32 *secid __attribute__((unused))) { return 0; } -static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl) +static inline void security_skb_classify_flow(struct sk_buff *skb __attribute__((unused)), struct flowi *fl __attribute__((unused))) { } @@ -2860,67 +2863,67 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid); int security_path_chroot(struct path *path); #else /* CONFIG_SECURITY_PATH */ -static inline int security_path_unlink(struct path *dir, struct dentry *dentry) +static inline int security_path_unlink(struct path *dir __attribute__((unused)), struct dentry *dentry __attribute__((unused))) { return 0; } -static inline int security_path_mkdir(struct path *dir, struct dentry *dentry, - int mode) +static inline int security_path_mkdir(struct path *dir __attribute__((unused)), struct dentry *dentry __attribute__((unused)), + int mode __attribute__((unused))) { return 0; } -static inline int security_path_rmdir(struct path *dir, struct dentry *dentry) +static inline int security_path_rmdir(struct path *dir __attribute__((unused)), struct dentry *dentry __attribute__((unused))) { return 0; } -static inline int security_path_mknod(struct path *dir, struct dentry *dentry, - int mode, unsigned int dev) +static inline int security_path_mknod(struct path *dir __attribute__((unused)), struct dentry *dentry __attribute__((unused)), + int mode __attribute__((unused)), unsigned int dev __attribute__((unused))) { return 0; } -static inline int security_path_truncate(struct path *path) +static inline int security_path_truncate(struct path *path __attribute__((unused))) { return 0; } -static inline int security_path_symlink(struct path *dir, struct dentry *dentry, - const char *old_name) +static inline int security_path_symlink(struct path *dir __attribute__((unused)), struct dentry *dentry __attribute__((unused)), + const char *old_name __attribute__((unused))) { return 0; } -static inline int security_path_link(struct dentry *old_dentry, - struct path *new_dir, - struct dentry *new_dentry) +static inline int security_path_link(struct dentry *old_dentry __attribute__((unused)), + struct path *new_dir __attribute__((unused)), + struct dentry *new_dentry __attribute__((unused))) { return 0; } -static inline int security_path_rename(struct path *old_dir, - struct dentry *old_dentry, - struct path *new_dir, - struct dentry *new_dentry) +static inline int security_path_rename(struct path *old_dir __attribute__((unused)), + struct dentry *old_dentry __attribute__((unused)), + struct path *new_dir __attribute__((unused)), + struct dentry *new_dentry __attribute__((unused))) { return 0; } -static inline int security_path_chmod(struct dentry *dentry, - struct vfsmount *mnt, - mode_t mode) +static inline int security_path_chmod(struct dentry *dentry __attribute__((unused)), + struct vfsmount *mnt __attribute__((unused)), + mode_t mode __attribute__((unused))) { return 0; } -static inline int security_path_chown(struct path *path, uid_t uid, gid_t gid) +static inline int security_path_chown(struct path *path __attribute__((unused)), uid_t uid __attribute__((unused)), gid_t gid __attribute__((unused))) { return 0; } -static inline int security_path_chroot(struct path *path) +static inline int security_path_chroot(struct path *path __attribute__((unused))) { return 0; } @@ -2937,20 +2940,20 @@ #else -static inline int security_key_alloc(struct key *key, - const struct cred *cred, - unsigned long flags) +static inline int security_key_alloc(struct key *key __attribute__((unused)), + const struct cred *cred __attribute__((unused)), + unsigned long flags __attribute__((unused))) { return 0; } -static inline void security_key_free(struct key *key) +static inline void security_key_free(struct key *key __attribute__((unused))) { } -static inline int security_key_permission(key_ref_t key_ref, - const struct cred *cred, - key_perm_t perm) +static inline int security_key_permission(key_ref_t key_ref __attribute__((unused)), + const struct cred *cred __attribute__((unused)), + key_perm_t perm __attribute__((unused))) { return 0; } @@ -2974,24 +2977,24 @@ #else -static inline int security_audit_rule_init(u32 field, u32 op, char *rulestr, - void **lsmrule) +static inline int security_audit_rule_init(u32 field, u32 op __attribute__((unused)), char *rulestr __attribute__((unused)), + void **lsmrule __attribute__((unused))) { return 0; } -static inline int security_audit_rule_known(struct audit_krule *krule) +static inline int security_audit_rule_known(struct audit_krule *krule __attribute__((unused))) { return 0; } -static inline int security_audit_rule_match(u32 secid, u32 field, u32 op, - void *lsmrule, struct audit_context *actx) +static inline int security_audit_rule_match(u32 secid __attribute__((unused)), u32 field __attribute__((unused)), u32 op __attribute__((unused)), + void *lsmrule __attribute__((unused)), struct audit_context *actx __attribute__((unused))) { return 0; } -static inline void security_audit_rule_free(void *lsmrule) +static inline void security_audit_rule_free(void *lsmrule __attribute__((unused))) { } #endif /* CONFIG_SECURITY */ @@ -3007,22 +3010,22 @@ #else /* CONFIG_SECURITYFS */ -static inline struct dentry *securityfs_create_dir(const char *name, - struct dentry *parent) +static inline struct dentry *securityfs_create_dir(const char *name __attribute__((unused)), + struct dentry *parent __attribute__((unused))) { return ERR_PTR(-ENODEV); } -static inline struct dentry *securityfs_create_file(const char *name, - mode_t mode, - struct dentry *parent, - void *data, - const struct file_operations *fops) +static inline struct dentry *securityfs_create_file(const char *name __attribute__((unused)), + mode_t mode __attribute__((unused)), + struct dentry *parent __attribute__((unused)), + void *data __attribute__((unused)), + const struct file_operations *fops __attribute__((unused))) { return ERR_PTR(-ENODEV); } -static inline void securityfs_remove(struct dentry *dentry) +static inline void securityfs_remove(struct dentry *dentry __attribute__((unused))) {} #endif @@ -3046,9 +3049,10 @@ return (char *)1; } -static inline void free_secdata(void *secdata) +static inline void free_secdata(void *secdata __attribute__((unused))) { } #endif /* CONFIG_SECURITY */ +#pragma GCC diagnostic pop #endif /* ! __LINUX_SECURITY_H */