Commit-ID: f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2 Gitweb: http://git.kernel.org/tip/f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2 Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx> AuthorDate: Tue, 24 Mar 2009 11:59:23 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 24 Mar 2009 11:04:19 +0100 fs: don't include <linux/gfp.h> to fix headers-export-check Impact: fix build This patch fixes a headers-export-check failure: /home/mingo/tip/usr/include/linux/bsg.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> /home/mingo/tip/usr/include/linux/fs.h:11: included file 'linux/gfp.h' is not exported make[3]: *** [/home/mingo/tip/usr/include/linux/.check] Error 1 make[2]: *** [linux] Error 2 Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@xxxxxxxxxxx> LKML-Reference: <1237888763.25315.70.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- include/linux/fs.h | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index add95da..11fdc57 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -8,7 +8,6 @@ #include <linux/limits.h> #include <linux/ioctl.h> -#include <linux/gfp.h> /* * It's silly to have NR_OPEN bigger than NR_FILE, but you can change @@ -2233,15 +2232,12 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, #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); -} +/* + * 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) { -- 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