From 172cc746974f1565622ff13c791985edb23b8a00 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 8 Feb 2008 13:13:27 +0000 Subject: [PATCH] --- yaml --- r: 85951 b: refs/heads/master c: eaf7943cc53d9688aa10267a226165356e956ec5 h: refs/heads/master i: 85949: 2b33e5cff2de8029621a97a6c47389c76bc6b173 85947: 989dd7ef05595c60d75b903e249d9a2129215f84 85943: c68a2d697f609a53e026b6f2c9dbdc3d1854a878 85935: 7b1c0cd52b1e34a9f79f658b803f2465cce07b2a 85919: 28f8f892ca480963423d7815e4a8ca66a9b8d25c 85887: 7b88ceeae015a9f1160ef2f52b89053a3c405dd0 v: v3 --- [refs] | 2 +- trunk/include/asm-mips/mach-ip27/dma-coherence.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b2bbc9910fce..5a53b62c559b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e568536d94256819f17662c26c82a42e44a7a7c +refs/heads/master: eaf7943cc53d9688aa10267a226165356e956ec5 diff --git a/trunk/include/asm-mips/mach-ip27/dma-coherence.h b/trunk/include/asm-mips/mach-ip27/dma-coherence.h index 3fdbbf68e952..ed7e6222dc15 100644 --- a/trunk/include/asm-mips/mach-ip27/dma-coherence.h +++ b/trunk/include/asm-mips/mach-ip27/dma-coherence.h @@ -35,7 +35,7 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) { - return dma_addr & (0xffUL << 56); + return dma_addr & ~(0xffUL << 56); } static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)