diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /include/asm-generic/bug.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
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 |