diff options
Diffstat (limited to 'include/asm-generic/bug.h')
| -rw-r--r-- | include/asm-generic/bug.h | 19 | 
1 files changed, 10 insertions, 9 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 9f02005f217..7d10f962aa1 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -2,12 +2,19 @@  #define _ASM_GENERIC_BUG_H  #include <linux/compiler.h> + +#ifdef CONFIG_GENERIC_BUG +#define BUGFLAG_WARNING		(1 << 0) +#define BUGFLAG_TAINT(taint)	(BUGFLAG_WARNING | ((taint) << 8)) +#define BUG_GET_TAINT(bug)	((bug)->flags >> 8) +#endif + +#ifndef __ASSEMBLY__  #include <linux/kernel.h>  #ifdef CONFIG_BUG  #ifdef CONFIG_GENERIC_BUG -#ifndef __ASSEMBLY__  struct bug_entry {  #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS  	unsigned long	bug_addr; @@ -24,12 +31,6 @@ struct bug_entry {  #endif  	unsigned short	flags;  }; -#endif		/* __ASSEMBLY__ */ - -#define BUGFLAG_WARNING		(1 << 0) -#define BUGFLAG_TAINT(taint)	(BUGFLAG_WARNING | ((taint) << 8)) -#define BUG_GET_TAINT(bug)	((bug)->flags >> 8) -  #endif	/* CONFIG_GENERIC_BUG */  /* @@ -61,7 +62,6 @@ struct bug_entry {   * to provide better diagnostics.   */  #ifndef __WARN_TAINT -#ifndef __ASSEMBLY__  extern __printf(3, 4)  void warn_slowpath_fmt(const char *file, const int line,  		       const char *fmt, ...); @@ -70,7 +70,6 @@ void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,  			     const char *fmt, ...);  extern void warn_slowpath_null(const char *file, const int line);  #define WANT_WARN_ON_SLOWPATH -#endif  #define __WARN()		warn_slowpath_null(__FILE__, __LINE__)  #define __WARN_printf(arg...)	warn_slowpath_fmt(__FILE__, __LINE__, arg)  #define __WARN_printf_taint(taint, arg...)				\ @@ -203,4 +202,6 @@ extern void warn_slowpath_null(const char *file, const int line);  # define WARN_ON_SMP(x)			({0;})  #endif +#endif /* __ASSEMBLY__ */ +  #endif  |