Commit-ID: f3edf88c0f4cd0ef90b6dd18953fb8ca6842d5a8 Gitweb: http://git.kernel.org/tip/f3edf88c0f4cd0ef90b6dd18953fb8ca6842d5a8 Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx> AuthorDate: Tue, 24 Mar 2009 17:00:03 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 24 Mar 2009 16:39:13 +0100 kmemtrace, fs, security: move alloc_secdata() and free_secdata() linux/security.h Impact: cleanup As suggested by Alexey Dobriyan, move alloc_secdata() and free_secdata() to linux/security.h and make them static inlines again. Reported-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@xxxxxxxxxxx> LKML-Reference: <1237906803.25315.96.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- include/linux/fs.h | 18 ------------------ include/linux/security.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 11fdc57..159f7b8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2230,24 +2230,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf, ssize_t simple_attr_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos); - -#ifdef CONFIG_SECURITY -/* - * These need to be macros because we cannot include <linux/gfp.h> in this - * header file. - */ -#define alloc_secdata() (char *)get_zeroed_page(GFP_KERNEL) -#define free_secdata(secdata) free_page((unsigned long) secdata) -#else -static inline char *alloc_secdata(void) -{ - return (char *)1; -} - -static inline void free_secdata(void *secdata) -{ } -#endif /* CONFIG_SECURITY */ - struct ctl_table; int proc_nr_files(struct ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos); diff --git a/include/linux/security.h b/include/linux/security.h index 1f2ab63..e3e2f8a 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -32,6 +32,7 @@ #include <linux/sched.h> #include <linux/key.h> #include <linux/xfrm.h> +#include <linux/gfp.h> #include <net/flow.h> /* Maximum number of letters for an LSM name string */ @@ -2966,5 +2967,28 @@ static inline void securityfs_remove(struct dentry *dentry) #endif +#ifdef CONFIG_SECURITY + +static inline char *alloc_secdata(void) +{ + return (char *)get_zeroed_page(GFP_KERNEL); +} + +static inline void free_secdata(void *secdata) +{ + free_page((unsigned long)secdata); +} + +#else + +static inline char *alloc_secdata(void) +{ + return (char *)1; +} + +static inline void free_secdata(void *secdata) +{ } +#endif /* CONFIG_SECURITY */ + #endif /* ! __LINUX_SECURITY_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html