From 1ad26e46f9d4f375eaa313b227a1fcb29c7b87bf Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 25 Feb 2009 16:40:10 +0100 Subject: [PATCH] --- yaml --- r: 136983 b: refs/heads/master c: 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f h: refs/heads/master i: 136981: c426932a7ea3de81e5eaa3c6a8d465b14b83a61b 136979: 8fde6d6d86355a8c99e13b7e699b25de65653459 136975: 9ba1e9903cafb6bcbffaff4cbfdae940a4fe25ca v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/io.h | 2 +- trunk/arch/x86/mm/ioremap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9e781990c08..c6a1f2d200c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17581ad812a9abb0182260374ef2e52d4a808a64 +refs/heads/master: 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f diff --git a/trunk/arch/x86/include/asm/io.h b/trunk/arch/x86/include/asm/io.h index 1dbbdf4be9b4..bcf7ea4e1367 100644 --- a/trunk/arch/x86/include/asm/io.h +++ b/trunk/arch/x86/include/asm/io.h @@ -91,7 +91,7 @@ extern void unxlate_dev_mem_ptr(unsigned long phys, void *addr); 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 diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c index f45d5e29a72e..433f7bd4648a 100644 --- a/trunk/arch/x86/mm/ioremap.c +++ b/trunk/arch/x86/mm/ioremap.c @@ -348,7 +348,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,