diff options
| -rw-r--r-- | arch/x86/include/asm/io.h | 2 | ||||
| -rw-r--r-- | arch/x86/mm/ioremap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 1dbbdf4be9b4..bcf7ea4e1367 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h | |||
| @@ -91,7 +91,7 @@ extern void unxlate_dev_mem_ptr(unsigned long phys, void *addr); | |||
| 91 | 91 | ||
| 92 | extern int ioremap_change_attr(unsigned long vaddr, unsigned long size, | 92 | extern int ioremap_change_attr(unsigned long vaddr, unsigned long size, |
| 93 | unsigned long prot_val); | 93 | unsigned long prot_val); |
| 94 | extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size); | 94 | extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); |
| 95 | 95 | ||
| 96 | /* | 96 | /* |
| 97 | * early_ioremap() and early_iounmap() are for temporary early boot-time | 97 | * early_ioremap() and early_iounmap() are for temporary early boot-time |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index f45d5e29a72e..433f7bd4648a 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -348,7 +348,7 @@ EXPORT_SYMBOL(ioremap_nocache); | |||
| 348 | * | 348 | * |
| 349 | * Must be freed with iounmap. | 349 | * Must be freed with iounmap. |
| 350 | */ | 350 | */ |
| 351 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) | 351 | void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size) |
| 352 | { | 352 | { |
| 353 | if (pat_enabled) | 353 | if (pat_enabled) |
| 354 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, | 354 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, |
