diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /include/asm-generic/bug.h | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'include/asm-generic/bug.h')
| -rw-r--r-- | include/asm-generic/bug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 0f6dabd4b517..12c07c1866b2 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
| @@ -41,7 +41,7 @@ extern void warn_slowpath(const char *file, const int line, | |||
| 41 | #define __WARN() warn_on_slowpath(__FILE__, __LINE__) | 41 | #define __WARN() warn_on_slowpath(__FILE__, __LINE__) |
| 42 | #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) | 42 | #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) |
| 43 | #else | 43 | #else |
| 44 | #define __WARN_printf(arg...) __WARN() | 44 | #define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0) |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #ifndef WARN_ON | 47 | #ifndef WARN_ON |