From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 9 Dec 2013 00:54:21 +0000 (+0000)
Subject: Merge branches 'fixes', 'kees' and 'misc' into for-next
X-Git-Tag: next-20131210~99^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4599b2b118c3eed7f8c22aad90cad08a79f9cc85;p=karo-tx-linux.git

Merge branches 'fixes', 'kees' and 'misc' into for-next
---

4599b2b118c3eed7f8c22aad90cad08a79f9cc85
diff --cc arch/arm/mm/dma-mapping.c
index f6b6bfa88ecf,c143a7bb681b,f0ea0134e5a3,79f8b39801a8..6492154934f9
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@@@ -185,7 -185,7 -180,7 -180,7 +185,7 @@@@@ static u64 get_coherent_dma_mask(struc
    		 */
    		if (sizeof(mask) != sizeof(dma_addr_t) &&
    		    mask > (dma_addr_t)~0 &&
-   		    dma_to_pfn(dev, ~0) > max_dma_pfn) {
  --		    dma_to_pfn(dev, ~0) > arm_dma_pfn_limit) {
+ ++		    dma_to_pfn(dev, ~0) < max_dma_pfn) {
    			dev_warn(dev, "Coherent DMA mask %#llx is larger than dma_addr_t allows\n",
    				 mask);
    			dev_warn(dev, "Driver did not use or check the return value from dma_set_coherent_mask()?\n");