diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /arch/x86/mm/ioremap.c | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/mm/ioremap.c')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 6ba6f889c79d..d4b6e6a29ae3 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -553,13 +553,11 @@ static int __init check_early_ioremap_leak(void) | |||
| 553 | { | 553 | { |
| 554 | if (!early_ioremap_nested) | 554 | if (!early_ioremap_nested) |
| 555 | return 0; | 555 | return 0; |
| 556 | 556 | WARN(1, KERN_WARNING | |
| 557 | printk(KERN_WARNING | ||
| 558 | "Debug warning: early ioremap leak of %d areas detected.\n", | 557 | "Debug warning: early ioremap leak of %d areas detected.\n", |
| 559 | early_ioremap_nested); | 558 | early_ioremap_nested); |
| 560 | printk(KERN_WARNING | 559 | printk(KERN_WARNING |
| 561 | "please boot with early_ioremap_debug and report the dmesg.\n"); | 560 | "please boot with early_ioremap_debug and report the dmesg.\n"); |
| 562 | WARN_ON(1); | ||
| 563 | 561 | ||
| 564 | return 1; | 562 | return 1; |
| 565 | } | 563 | } |