From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-f48.google.com (mail-yh0-f48.google.com [209.85.213.48]) by kanga.kvack.org (Postfix) with ESMTP id CF7276B0037 for ; Tue, 10 Dec 2013 14:30:14 -0500 (EST) Received: by mail-yh0-f48.google.com with SMTP id f73so4215109yha.21 for ; Tue, 10 Dec 2013 11:30:14 -0800 (PST) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com. [192.94.94.40]) by mx.google.com with ESMTPS id v65si14815500yhp.233.2013.12.10.11.30.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Dec 2013 11:30:13 -0800 (PST) From: Santosh Shilimkar Subject: [PATCH 1/2] mm/ARM: dma: fix conflicting types for 'arm_dma_zone_size' Date: Tue, 10 Dec 2013 14:29:57 -0500 Message-ID: <1386703798-26521-2-git-send-email-santosh.shilimkar@ti.com> In-Reply-To: <1386703798-26521-1-git-send-email-santosh.shilimkar@ti.com> References: <1386703798-26521-1-git-send-email-santosh.shilimkar@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Grygorii Strashko , Russell King , Rob Herring , Yinghai Lu , Tejun Heo , Santosh Shilimkar From: Grygorii Strashko Commit 364230b9 "ARM: use phys_addr_t for DMA zone sizes" changes type of arm_dma_zone_size to phys_addr_t, but misses to update external definition of it in in arch/arm/include/asm/dma.h. As result, kernel build is failed if CONFIG_ZONE_DMA is enabled: arch/arm/mm/init.c:202:13: error: conflicting types for 'arm_dma_zone_size' include/linux/bootmem.h:258:66: note: previous declaration of 'arm_dma_zone_size' was here Hence, fix external definition of arm_dma_zone_size. Cc: Russell King Cc: Rob Herring Cc: Yinghai Lu Cc: Tejun Heo Cc: Andrew Morton Signed-off-by: Grygorii Strashko Signed-off-by: Santosh Shilimkar --- arch/arm/include/asm/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 58b8c6a..1439b80 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -8,7 +8,7 @@ #define MAX_DMA_ADDRESS 0xffffffffUL #else #define MAX_DMA_ADDRESS ({ \ - extern unsigned long arm_dma_zone_size; \ + extern phys_addr_t arm_dma_zone_size; \ arm_dma_zone_size ? \ (PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; }) #endif -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org