diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-03-25 07:31:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-06 10:10:55 -0700 |
| commit | f4323dc41d8d1af7bc439816007f86559fc7e405 (patch) | |
| tree | 04cafa50fb925d2e1b76e107c1ac7b61e3e2351f /arch | |
| parent | 13fc4d0e8e969ca7186c181dc61c64d4b164f252 (diff) | |
x86: ioremap of 64-bit resource on 32-bit kernel fix
commit 756a6c68556600aec9460346332884d891d5beb4 upstream
x86: ioremap of 64-bit resource on 32-bit kernel fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 794895c6dcc..f96b2e4d5f2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -39,7 +39,7 @@ EXPORT_SYMBOL(__phys_addr); int page_is_ram(unsigned long pagenr) { - unsigned long addr, end; + resource_size_t addr, end; int i; /* @@ -109,7 +109,8 @@ static int ioremap_change_attr(unsigned long vaddr, unsigned long size, static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, enum ioremap_mode mode) { - unsigned long pfn, offset, last_addr, vaddr; + unsigned long pfn, offset, vaddr; + resource_size_t last_addr; struct vm_struct *area; pgprot_t prot; |