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 <lauraa@codeaurora.org>
SuperiorOS-Devices · Apr 11, 2013 · 771c304 · 771c304
1 parent 938d750
commit 771c304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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(),