[Patch] fix a headers_check warning in include/linux/kernel.h

[Patch] fix a headers_check warning in include/linux/kernel.h

[Américo Wang]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

This fixes the warning:

linux-2.6/usr/include/linux/kernel.h:65: userspace cannot reference
function or variable defined in the kernel

As Michal noted, BUILD_BUG_ON stuffs should be moved
under #ifdef __KERNEL__.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

[-- Attachment #2: include-linux-kernel_h-fix-headers-check-warning.diff --]
[-- Type: text/x-patch, Size: 2550 bytes --]

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 953352a..748d004 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -646,29 +646,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
-struct sysinfo;
-extern int do_sysinfo(struct sysinfo *info);
-
-#endif /* __KERNEL__ */
-
-#define SI_LOAD_SHIFT	16
-struct sysinfo {
-	long uptime;			/* Seconds since boot */
-	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-	unsigned long totalram;		/* Total usable main memory size */
-	unsigned long freeram;		/* Available memory size */
-	unsigned long sharedram;	/* Amount of shared memory */
-	unsigned long bufferram;	/* Memory used by buffers */
-	unsigned long totalswap;	/* Total swap space size */
-	unsigned long freeswap;		/* swap space still available */
-	unsigned short procs;		/* Number of current processes */
-	unsigned short pad;		/* explicit padding for m68k */
-	unsigned long totalhigh;	/* Total high memory size */
-	unsigned long freehigh;		/* Available high memory size */
-	unsigned int mem_unit;		/* Memory unit size in bytes */
-	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-};
-
 #ifdef __CHECKER__
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
 #define BUILD_BUG_ON_ZERO(e) (0)
@@ -714,6 +691,30 @@ extern int __build_bug_on_failed;
 #endif
 #endif	/* __CHECKER__ */
 
+
+struct sysinfo;
+extern int do_sysinfo(struct sysinfo *info);
+
+#endif /* __KERNEL__ */
+
+#define SI_LOAD_SHIFT	16
+struct sysinfo {
+	long uptime;			/* Seconds since boot */
+	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
+	unsigned long totalram;		/* Total usable main memory size */
+	unsigned long freeram;		/* Available memory size */
+	unsigned long sharedram;	/* Amount of shared memory */
+	unsigned long bufferram;	/* Memory used by buffers */
+	unsigned long totalswap;	/* Total swap space size */
+	unsigned long freeswap;		/* swap space still available */
+	unsigned short procs;		/* Number of current processes */
+	unsigned short pad;		/* explicit padding for m68k */
+	unsigned long totalhigh;	/* Total high memory size */
+	unsigned long freehigh;		/* Available high memory size */
+	unsigned int mem_unit;		/* Memory unit size in bytes */
+	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
+};
+
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)
 

Re: [Patch] fix a headers_check warning in include/linux/kernel.h

[Arnaud Lacombe]

Hi,

On Sun, Jul 17, 2011 at 3:46 AM, Américo Wang <xiyou.wangcong@gmail.com> wrote:
> This fixes the warning:
>
> linux-2.6/usr/include/linux/kernel.h:65: userspace cannot reference
> function or variable defined in the kernel
>
> As Michal noted, BUILD_BUG_ON stuffs should be moved
> under #ifdef __KERNEL__.
>
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>
Why not all the other macros below the BUILD_BUG_ON stuff ? E.g. do we
want to export __FUNCTION__ ? NUMA_BUILD ? COMPACTION_BUILD ?
REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD ?

 - Arnaud

Re: [Patch] fix a headers_check warning in include/linux/kernel.h

[Américo Wang]

On Tue, Jul 19, 2011 at 12:51 AM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> On Sun, Jul 17, 2011 at 3:46 AM, Américo Wang <xiyou.wangcong@gmail.com> wrote:
>> This fixes the warning:
>>
>> linux-2.6/usr/include/linux/kernel.h:65: userspace cannot reference
>> function or variable defined in the kernel
>>
>> As Michal noted, BUILD_BUG_ON stuffs should be moved
>> under #ifdef __KERNEL__.
>>
>> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>>
> Why not all the other macros below the BUILD_BUG_ON stuff ? E.g. do we
> want to export __FUNCTION__ ? NUMA_BUILD ? COMPACTION_BUILD ?
> REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD ?
>

Right, certainly we should move them too.

I saw Andrew already merged a delta patch. Thanks to both of you!

Re: [Patch] fix a headers_check warning in include/linux/kernel.h

[Arnaud Lacombe]

Hi,

For the sake of having a patch ready. I actually did it yesterday but did not
send it then. Cc'ed to the authors of the relevant macros; __FUNCTION__ was
actually exported since ages, but I really do not see why the kernel exports
this macros...

 - Arnaud

-- 
From: Arnaud Lacombe <lacombar@gmail.com>
Subject: linux/kernel.h: hide internal macros

Unexpose to userland the following macros
 - BUILD_BUG_ON.*
 - __FUNCTION__
 - NUMA_BUILD
 - COMPACTION_BUILD
 - REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
 include/linux/kernel.h |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 567a6f7..9a43ad7 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -646,29 +646,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
-struct sysinfo;
-extern int do_sysinfo(struct sysinfo *info);
-
-#endif /* __KERNEL__ */
-
-#define SI_LOAD_SHIFT	16
-struct sysinfo {
-	long uptime;			/* Seconds since boot */
-	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-	unsigned long totalram;		/* Total usable main memory size */
-	unsigned long freeram;		/* Available memory size */
-	unsigned long sharedram;	/* Amount of shared memory */
-	unsigned long bufferram;	/* Memory used by buffers */
-	unsigned long totalswap;	/* Total swap space size */
-	unsigned long freeswap;		/* swap space still available */
-	unsigned short procs;		/* Number of current processes */
-	unsigned short pad;		/* explicit padding for m68k */
-	unsigned long totalhigh;	/* Total high memory size */
-	unsigned long freehigh;		/* Available high memory size */
-	unsigned int mem_unit;		/* Memory unit size in bytes */
-	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-};
-
 #ifdef __CHECKER__
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
 #define BUILD_BUG_ON_ZERO(e) (0)
@@ -736,4 +713,27 @@ extern int __build_bug_on_failed;
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
 #endif
 
+struct sysinfo;
+extern int do_sysinfo(struct sysinfo *info);
+
+#endif /* __KERNEL__ */
+
+#define SI_LOAD_SHIFT	16
+struct sysinfo {
+	long uptime;			/* Seconds since boot */
+	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
+	unsigned long totalram;		/* Total usable main memory size */
+	unsigned long freeram;		/* Available memory size */
+	unsigned long sharedram;	/* Amount of shared memory */
+	unsigned long bufferram;	/* Memory used by buffers */
+	unsigned long totalswap;	/* Total swap space size */
+	unsigned long freeswap;		/* swap space still available */
+	unsigned short procs;		/* Number of current processes */
+	unsigned short pad;		/* explicit padding for m68k */
+	unsigned long totalhigh;	/* Total high memory size */
+	unsigned long freehigh;		/* Available high memory size */
+	unsigned int mem_unit;		/* Memory unit size in bytes */
+	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
+};
+
 #endif
-- 
1.7.6.153.g78432

Re: [Patch] fix a headers_check warning in include/linux/kernel.h

[Steven Rostedt]

On Mon, 2011-07-18 at 18:00 -0400, Arnaud Lacombe wrote:
> Hi,
> 
> For the sake of having a patch ready. I actually did it yesterday but did not
> send it then. Cc'ed to the authors of the relevant macros; __FUNCTION__ was
> actually exported since ages, but I really do not see why the kernel exports
> this macros...
> 
>  - Arnaud
> 
> -- 
> From: Arnaud Lacombe <lacombar@gmail.com>
> Subject: linux/kernel.h: hide internal macros
> 
> Unexpose to userland the following macros
>  - BUILD_BUG_ON.*
>  - __FUNCTION__
>  - NUMA_BUILD
>  - COMPACTION_BUILD
>  - REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve