Commit 756a6c68 authored by Ingo Molnar's avatar Ingo Molnar

x86: ioremap of 64-bit resource on 32-bit kernel fix

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5af5573e
...@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr) ...@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr)
int page_is_ram(unsigned long pagenr) int page_is_ram(unsigned long pagenr)
{ {
unsigned long addr, end; resource_size_t addr, end;
int i; int i;
/* /*
...@@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size, ...@@ -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, static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
unsigned long prot_val) 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; struct vm_struct *area;
unsigned long new_prot_val; unsigned long new_prot_val;
pgprot_t prot; pgprot_t prot;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment