[stable] last-minute patch for 2.6.25-stable

[Chuck Ebbert <cebbert@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 54 bytes --]

I meant to send this yesterday but didn't get to it.


[-- Attachment #2: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch --]
[-- Type: text/plain, Size: 1117 bytes --]

From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 25 Mar 2008 07:31:17 +0000 (+0100)
Subject: x86: ioremap of 64-bit resource on 32-bit kernel fix
X-Git-Tag: v2.6.26-rc1~1154^2~109
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=756a6c68556600aec9460346332884d891d5beb4

x86: ioremap of 64-bit resource on 32-bit kernel fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7338c5d..c590fd2 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr)
 
 int page_is_ram(unsigned long pagenr)
 {
-	unsigned long addr, end;
+	resource_size_t addr, end;
 	int i;
 
 	/*
@@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size,
 static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
 			       enum ioremap_mode mode)
 {
-	unsigned long pfn, offset, last_addr, vaddr;
+	unsigned long pfn, offset, vaddr;
+	resource_size_t last_addr;
 	struct vm_struct *area;
 	pgprot_t prot;