diff options
author | Cyril Chemparathy <cyril@ti.com> | 2012-09-12 14:05:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 18:32:50 -0400 |
commit | 7e6735c3578e76c270a2797225a4214176ba13ef (patch) | |
tree | bc196f86d8699cd1eba80e8a3ebc1ba38e8a2bba /arch/ia64 | |
parent | 6f0c0580b70c89094b3422ba81118c7b959c7556 (diff) |
/dev/mem: use phys_addr_t for physical addresses
This patch fixes the /dev/mem driver to use phys_addr_t for physical
addresses. This is required on PAE systems, especially those that run
entirely out of >4G physical memory space.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/io.h | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/efi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 2c26321c28c3..74a7cc3293bc 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h | |||
@@ -90,7 +90,7 @@ phys_to_virt (unsigned long address) | |||
90 | 90 | ||
91 | #define ARCH_HAS_VALID_PHYS_ADDR_RANGE | 91 | #define ARCH_HAS_VALID_PHYS_ADDR_RANGE |
92 | extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size); | 92 | extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size); |
93 | extern int valid_phys_addr_range (unsigned long addr, size_t count); /* efi.c */ | 93 | extern int valid_phys_addr_range (phys_addr_t addr, size_t count); /* efi.c */ |
94 | extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count); | 94 | extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count); |
95 | 95 | ||
96 | /* | 96 | /* |
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index d37bbd48637f..f034563aeae5 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
@@ -870,7 +870,7 @@ kern_mem_attribute (unsigned long phys_addr, unsigned long size) | |||
870 | EXPORT_SYMBOL(kern_mem_attribute); | 870 | EXPORT_SYMBOL(kern_mem_attribute); |
871 | 871 | ||
872 | int | 872 | int |
873 | valid_phys_addr_range (unsigned long phys_addr, unsigned long size) | 873 | valid_phys_addr_range (phys_addr_t phys_addr, unsigned long size) |
874 | { | 874 | { |
875 | u64 attr; | 875 | u64 attr; |
876 | 876 | ||