| From dhobsong@igel.co.jp Mon Oct 29 00:53:07 2012 |
| From: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Date: Mon, 29 Oct 2012 16:50:49 +0900 |
| Subject: [PATCH v2 32/58] ARM: mm: fix type of the arm_dma_limit global variable |
| To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au |
| Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp |
| Message-ID: <1351497075-32717-33-git-send-email-dhobsong@igel.co.jp> |
| |
| |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| |
| arm_dma_limit stores physical address of maximal address accessible by DMA, |
| so the phys_addr_t type makes much more sense for it instead of u32. This |
| patch fixes the following build warning: |
| |
| arch/arm/mm/init.c:380: warning: comparison of distinct pointer types lacks a cast |
| |
| Reported-by: Russell King <linux@arm.linux.org.uk> |
| Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| (cherry picked from commit 4986e5c7cd91817d0f58dd15073c9080d47980cf) |
| |
| Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| --- |
| arch/arm/mm/init.c | 2 +- |
| arch/arm/mm/mm.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/mm/init.c |
| +++ b/arch/arm/mm/init.c |
| @@ -215,7 +215,7 @@ EXPORT_SYMBOL(arm_dma_zone_size); |
| * allocations. This must be the smallest DMA mask in the system, |
| * so a successful GFP_DMA allocation will always satisfy this. |
| */ |
| -u32 arm_dma_limit; |
| +phys_addr_t arm_dma_limit; |
| |
| static void __init arm_adjust_dma_zone(unsigned long *size, unsigned long *hole, |
| unsigned long dma_size) |
| --- a/arch/arm/mm/mm.h |
| +++ b/arch/arm/mm/mm.h |
| @@ -65,7 +65,7 @@ extern void __flush_dcache_page(struct a |
| #endif |
| |
| #ifdef CONFIG_ZONE_DMA |
| -extern u32 arm_dma_limit; |
| +extern phys_addr_t arm_dma_limit; |
| #else |
| #define arm_dma_limit ((u32)~0) |
| #endif |
