[patch 5/6] x86 PAT: ioremap_wc should take resource_size_t parameter

[venkatesh.pallipadi@intel.com]

[-- Attachment #1: ioremap_wc_resource_size_change.patch --]
[-- Type: text/plain, Size: 1638 bytes --]

ioremap_wc was taking in unsigned long parameter, where as it should take 64
bit resource_size_t parameter like other ioremap variants.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>

---
 arch/x86/include/asm/io.h |    2 +-
 arch/x86/mm/ioremap.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/include/asm/io.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/io.h	2009-01-09 11:23:10.000000000 -0800
+++ linux-2.6/arch/x86/include/asm/io.h	2009-01-09 13:21:58.000000000 -0800
@@ -91,7 +91,7 @@ extern void unxlate_dev_mem_ptr(unsigned
 
 extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,
 				unsigned long prot_val);
-extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);
+extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size);
 
 /*
  * early_ioremap() and early_iounmap() are for temporary early boot-time
Index: linux-2.6/arch/x86/mm/ioremap.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/ioremap.c	2009-01-09 11:23:10.000000000 -0800
+++ linux-2.6/arch/x86/mm/ioremap.c	2009-01-09 13:21:58.000000000 -0800
@@ -367,7 +367,7 @@ EXPORT_SYMBOL(ioremap_nocache);
  *
  * Must be freed with iounmap.
  */
-void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
+void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size)
 {
 	if (pat_enabled)
 		return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,

--