Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d00f92f authored by WANG Cong's avatar WANG Cong Committed by Linus Torvalds
Browse files

include/linux/kernel.h: fix a headers_check warning 



Fix the warning:

  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: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0e44d4a

include/linux/kernel.h

+24 −23
Original line number Diff line number Diff line
@@ -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__)