Skip to contentSkip to conversation

fs: don't include <linux/gfp.h> to fix headers-export-check

PATCH In review Pekka Enberg 3 participants 5 messages Mar 24, 2009 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 fs: don't include <linux/gfp.h> to fix headers-export-check

From: Pekka Enberg <[email protected]>

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

Cc Eduard - Gabriel Munteanu <[email protected]>
---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
include/linux/fs.h +6 -10
index add95da..11fdc57 100644
@@ -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)
 {
Signature · 1 line
1.5.4.3
#1 lore raw
Commit-ID:  f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2
Gitweb:     http://git.kernel.org/tip/f9ebc8b5fa7b574df0f8d39643879edc77cb2fe2
Author:     Pekka Enberg <[email protected]>
AuthorDate: Tue, 24 Mar 2009 11:59:23 +0200
Committer:  Ingo Molnar <[email protected]>
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

Cc Eduard - Gabriel Munteanu <[email protected]>

LKML-Reference: <1237888763.25315.70.camel@penberg-laptop>

---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
include/linux/fs.h +6 -10
index add95da..11fdc57 100644
@@ -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)
 {
#2 lore raw
In reply to Pekka Enberg
Quoted 23 lines · Pekka Enberg


From: Pekka Enberg <[email protected]>

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

Cc Eduard - Gabriel Munteanu <[email protected]>

---
 include/linux/fs.h |   16 ++++++----------

 1 files changed, 6 insertions(+), 10 deletions(-)
include/linux/fs.h +0 -0
index add95da..11fdc57 100644
@@ -8,7 +8,6 @@
Quoted 6 lines


 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#include <linux/gfp.h>

 /*

I think a cleaner fix would be to move the include of gfp.h into the second #include block that is part of #ifdef __KERNEL__, as is the only user of get_zeroed_page in there.

	Arnd <><
#3 lore raw
Quoted 29 lines · Arnd Bergmann
Quoted 28 lines · Pekka Enberg

From: Pekka Enberg <[email protected]>

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

Cc Eduard - Gabriel Munteanu <[email protected]>
---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
include/linux/fs.h +0 -1
index add95da..11fdc57 100644
@@ -8,7 +8,6 @@
 
 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#include <linux/gfp.h>
 
Quoted 5 lines

include/linux/fs.h line 12

Quoted 1 line
include/linux/fs.h +0 -0
 /*

I think a cleaner fix would be to move the include of gfp.h into the second #include block that is part of #ifdef __KERNEL__, as is the only user of get_zeroed_page in there.

Alexey suggested putting the functions in security.h instead which is even better. I'll submit that formally as soon as I have the chance to test it.

Pekka

#4 lore raw
Quoted 36 lines · Pekka Enberg
Quoted 29 lines · Arnd Bergmann
Quoted 28 lines · Pekka Enberg

From: Pekka Enberg <[email protected]>

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

Cc Eduard - Gabriel Munteanu <[email protected]>
---
 include/linux/fs.h |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
include/linux/fs.h +0 -1
index add95da..11fdc57 100644
@@ -8,7 +8,6 @@
 
 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#include <linux/gfp.h>
 
Quoted 5 lines

include/linux/fs.h line 12

Quoted 1 line
include/linux/fs.h +0 -0
 /*

I think a cleaner fix would be to move the include of gfp.h into the second #include block that is part of #ifdef __KERNEL__, as is the only user of get_zeroed_page in there.

Quoted 3 lines

Alexey suggested putting the functions in security.h instead which is even better. I'll submit that formally as soon as I have the chance to test it.

yep. Hopefully it wont have ripple effects. The whole house of cards called include/linux/*.h seems to be imploding ;-)

Ingo