diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 09:42:59 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 09:42:59 +0200 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /include/asm-generic/bug.h | |
| parent | Merge branch 'common/pfc' into sh-latest (diff) | |
| parent | sh: pfc: pin config get/set support. (diff) | |
| download | linux-9ff561fdf73493d757bbc74aa58627e1381650fb.tar.xz linux-9ff561fdf73493d757bbc74aa58627e1381650fb.zip | |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'include/asm-generic/bug.h')
| -rw-r--r-- | include/asm-generic/bug.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 506ec19a3736..7d10f962aa13 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -3,10 +3,18 @@ #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; @@ -23,17 +31,8 @@ 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 */ -#ifndef __ASSEMBLY__ -#include <linux/kernel.h> - /* * Don't use BUG() or BUG_ON() unless there's really no way out; one * example might be detecting data structure corruption in the middle |