summaryrefslogtreecommitdiff
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-03-25 07:31:17 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-04-17 15:41:30 (GMT)
commit756a6c68556600aec9460346332884d891d5beb4 (patch)
treeb1988412484fe53536c019c629b12bd4ba364d68 /arch/x86/mm
parent5af5573ee06c361378e22a9dd71dae0320e841f7 (diff)
downloadlinux-756a6c68556600aec9460346332884d891d5beb4.tar.xz
x86: ioremap of 64-bit resource on 32-bit kernel fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/ioremap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7338c5d..c590fd2 100644
--- a/arch/x86/mm/ioremap.c
+++ b/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;