diff options
| author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-04-09 10:55:33 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 20:27:13 +0200 |
| commit | 9b987aeb4a7bc42a3eb8361030b820b0263c31f1 (patch) | |
| tree | 3933856c5787830b689e8f8b0221978cc58f7bb5 /arch/x86/include/asm/io.h | |
| parent | a0d22f485af1553060b4094ee0154537a8f6a8a6 (diff) | |
| download | kernel_samsung_smdk4412-9b987aeb4a7bc42a3eb8361030b820b0263c31f1.tar.gz kernel_samsung_smdk4412-9b987aeb4a7bc42a3eb8361030b820b0263c31f1.tar.bz2 kernel_samsung_smdk4412-9b987aeb4a7bc42a3eb8361030b820b0263c31f1.zip | |
x86: fix set_fixmap to use phys_addr_t
Impact: fix kprobes crash on 32-bit with RAM above 4G
Use phys_addr_t for receiving a physical address argument
instead of unsigned long. This allows fixmap to handle
pages higher than 4GB on x86-32.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: systemtap-ml <systemtap@sources.redhat.com>
Cc: Gary Hade <garyhade@us.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <49DE3695.6040800@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/io.h')
| -rw-r--r-- | arch/x86/include/asm/io.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index e5383e3d2f8..73739322b6d 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -193,8 +193,10 @@ extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); */ extern void early_ioremap_init(void); extern void early_ioremap_reset(void); -extern void __iomem *early_ioremap(unsigned long offset, unsigned long size); -extern void __iomem *early_memremap(unsigned long offset, unsigned long size); +extern void __iomem *early_ioremap(resource_size_t phys_addr, + unsigned long size); +extern void __iomem *early_memremap(resource_size_t phys_addr, + unsigned long size); extern void early_iounmap(void __iomem *addr, unsigned long size); #define IO_SPACE_LIMIT 0xffff |