From 771c3045b1c4f30b70e79bbd439c8e21e17ff0ca Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 9 Apr 2013 11:54:36 -0700 Subject: [PATCH] msm: memory: Use phys_addr_t as the return type for ebi functions On LPAE systems, ebi allocations may be greater than 32-bits. Use phys_addr_t as the return type for these allocations. Change-Id: I35a4f66d2c322869f2619253f99f339b6de7464a Signed-off-by: Laura Abbott --- arch/arm/mach-msm/include/mach/memory.h | 2 +- arch/arm/mach-msm/memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h index 56c4afdad549..6119a3c44000 100644 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -70,7 +70,7 @@ extern unsigned long ebi1_phys_offset; #ifndef __ASSEMBLY__ void *allocate_contiguous_ebi(unsigned long, unsigned long, int); -unsigned long allocate_contiguous_ebi_nomap(unsigned long, unsigned long); +phys_addr_t allocate_contiguous_ebi_nomap(unsigned long, unsigned long); void clean_and_invalidate_caches(unsigned long, unsigned long, unsigned long); void clean_caches(unsigned long, unsigned long, unsigned long); void invalidate_caches(unsigned long, unsigned long, unsigned long); diff --git a/arch/arm/mach-msm/memory.c b/arch/arm/mach-msm/memory.c index 2b4e97592444..fcb85a0db70b 100644 --- a/arch/arm/mach-msm/memory.c +++ b/arch/arm/mach-msm/memory.c @@ -257,7 +257,7 @@ void *allocate_contiguous_ebi(unsigned long size, } EXPORT_SYMBOL(allocate_contiguous_ebi); -unsigned long allocate_contiguous_ebi_nomap(unsigned long size, +phys_addr_t allocate_contiguous_ebi_nomap(unsigned long size, unsigned long align) { return _allocate_contiguous_memory_nomap(size, get_ebi_memtype(),