From 336237b2bf206ab294f90edc0ccbdeb2bc5d7acd Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 25 Mar 2008 08:31:17 +0100 Subject: [PATCH] --- yaml --- r: 89073 b: refs/heads/master c: 756a6c68556600aec9460346332884d891d5beb4 h: refs/heads/master i: 89071: f045da0daf5611d7ce461194df6a62cc372ee974 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/ioremap.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b1c6e85ce135..f08d8c1f5957 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5af5573ee06c361378e22a9dd71dae0320e841f7 +refs/heads/master: 756a6c68556600aec9460346332884d891d5beb4 diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c index 7338c5d3dd37..c590fd200e29 100644 --- a/trunk/arch/x86/mm/ioremap.c +++ b/trunk/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, unsigned long prot_val) { - unsigned long pfn, offset, last_addr, vaddr; + unsigned long pfn, offset, vaddr; + resource_size_t last_addr; struct vm_struct *area; unsigned long new_prot_val; pgprot_t prot;