From dfee7990a136bfadb2b88f17044f46d64f841e16 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 12 Dec 2008 09:20:12 +0100
Subject: [PATCH] --- yaml --- r: 120815 b: refs/heads/master c:
 8808500f26a61757cb414da76b271bbd09d5958c h: refs/heads/master i:   120813:
 c807a2ebe5339c685629630128289296e015c120   120811:
 f2c21a557ad20f63480534ef0785fc7d2d754122   120807:
 75a4ca8a3e5192aebef434c35dd6d1538ed8a196   120799:
 49c1e58673c06ed8fa84527abbf9ba287d29ff32 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/ioremap.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87e158243ed0..770df7204007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f5db591326779a80cfe490c5d6b6ce9fac08b31
+refs/heads/master: 8808500f26a61757cb414da76b271bbd09d5958c
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index d4c4307ff3e0..bd85d42819e1 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -223,7 +223,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
 	 * Check if the request spans more than any BAR in the iomem resource
 	 * tree.
 	 */
-	WARN_ON(iomem_map_sanity_check(phys_addr, size));
+	WARN_ONCE(iomem_map_sanity_check(phys_addr, size),
+		  KERN_INFO "Info: mapping multiple BARs. Your kernel is fine.");
 
 	/*
 	 * Don't allow anybody to remap normal RAM that we're using..