Re: ohci1394 problem (MMIO broken) (was 2.6.25-rc6-git6: Reported regressions from 2.6.24)

[Ingo Molnar <mingo@elte.hu>]

* Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:

> Thomas Meyer wrote:
>> Linus Torvalds schrieb:
>>> Does this patch make any difference?
>> Yes. With this patch applied the error messages doesn't appear anymore.
> ...
>> [    2.232822] ohci1394: Failed to remap registers - card not accessible
> ...
>> [    2.551959] firewire_ohci: Failed to remap registers
>
> ioremap() fails now.

64-bit ioremaps never worked on 32-bit, so we are in totally unchartered 
waters now - but due to the unification we have a realistic chance to 
make them work. At minimum we need the fix below in addition to Linus' 
patch - does it make any difference?

	Ingo

---
 arch/x86/mm/ioremap.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: v/arch/x86/mm/ioremap.c
===================================================================
--- v.orig/arch/x86/mm/ioremap.c
+++ v/arch/x86/mm/ioremap.c
@@ -39,7 +39,7 @@ EXPORT_SYMBOL(__phys_addr);
 
 int page_is_ram(unsigned long pagenr)
 {
-	unsigned long addr, end;
+	resource_size_t addr, end;
 	int i;
 
 	/*
@@ -109,7 +109,8 @@ static int ioremap_change_attr(unsigned 
 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;