diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 14:07:28 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 14:07:28 +0300 |
| commit | 598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (patch) | |
| tree | 675a2b01617549b539a4dcb1aec7141798e1f324 /arch/arm/include/asm/bug.h | |
| parent | 0bed4b7aa02c06e05121875dc443295d55b9d91d (diff) | |
| parent | e679660dbb8347f275fe5d83a5dd59c1fb6c8e63 (diff) | |
| download | linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.xz | |
Merge branches 'misc' and 'misc-rc6' into for-linus
Diffstat (limited to 'arch/arm/include/asm/bug.h')
| -rw-r--r-- | arch/arm/include/asm/bug.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h index e7335a92144e..4e6e88a6b2f4 100644 --- a/arch/arm/include/asm/bug.h +++ b/arch/arm/include/asm/bug.h @@ -5,8 +5,6 @@ #include <linux/types.h> #include <asm/opcodes.h> -#ifdef CONFIG_BUG - /* * Use a suitable undefined instruction to use for ARM/Thumb2 bug handling. * We need to be careful not to conflict with those used by other modules and @@ -47,7 +45,7 @@ do { \ unreachable(); \ } while (0) -#else /* not CONFIG_DEBUG_BUGVERBOSE */ +#else #define __BUG(__file, __line, __value) \ do { \ @@ -57,7 +55,6 @@ do { \ #endif /* CONFIG_DEBUG_BUGVERBOSE */ #define HAVE_ARCH_BUG -#endif /* CONFIG_BUG */ #include <asm-generic/bug.h> |