From d5b7a63abf35c65ba7fed3f6c74460b6854ea6fc Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 10 Apr 2008 15:09:50 -0700
Subject: [PATCH] --- yaml --- r: 90975 b: refs/heads/master c:
 4c8337ac425b220594fec45ad6d3ac76d3ce2b90 h: refs/heads/master i:   90973:
 d577fcf72ee0da0ad6f93854e65e9ea41f1520b9   90971:
 8e455b1e56e236f5b812200b2a67b9947e1052c3   90967:
 1a67323f69a430c650a7b927ad608d9ffe6e3f45   90959:
 f220275bec5219c4ac408b12b9b1cb8e78678f8d   90943:
 873d820d9592d0be4ceee52c89d37c26abab2b7e v: v3

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

diff --git a/[refs] b/[refs]
index 186db661edcb..de29be91f2e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a7a34af78923f8807d054a15133a8fcf47e385e
+refs/heads/master: 4c8337ac425b220594fec45ad6d3ac76d3ce2b90
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index c590fd200e29..3a4baf95e24d 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -134,7 +134,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
 
 	if (!phys_addr_valid(phys_addr)) {
 		printk(KERN_WARNING "ioremap: invalid physical address %llx\n",
-		       phys_addr);
+		       (unsigned long long)phys_addr);
 		WARN_ON_ONCE(1);
 		return NULL;
 	}
@@ -187,7 +187,8 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
 		     new_prot_val == _PAGE_CACHE_WB)) {
 			pr_debug(
 		"ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n",
-				phys_addr, phys_addr + size,
+				(unsigned long long)phys_addr,
+				(unsigned long long)(phys_addr + size),
 				prot_val, new_prot_val);
 			free_memtype(phys_addr, phys_addr + size);
 			return NULL;