diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /lib/iomap.c | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/iomap.c')
| -rw-r--r-- | lib/iomap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/iomap.c b/lib/iomap.c index 37a3ea4cac9f..d32229385151 100644 --- a/lib/iomap.c +++ b/lib/iomap.c | |||
| @@ -40,8 +40,7 @@ static void bad_io_access(unsigned long port, const char *access) | |||
| 40 | static int count = 10; | 40 | static int count = 10; |
| 41 | if (count) { | 41 | if (count) { |
| 42 | count--; | 42 | count--; |
| 43 | printk(KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access); | 43 | WARN(1, KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access); |
| 44 | WARN_ON(1); | ||
| 45 | } | 44 | } |
| 46 | } | 45 | } |
| 47 | 46 | ||