From 0f6852e12e8041fbcf58b4ea5cf19c0806f566da Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Thu, 16 Oct 2008 23:25:34 +0800
Subject: [PATCH] --- yaml --- r: 115167 b: refs/heads/master c:
 a92946bc6abad6494ac95ea1a8b7c224b15fa1f7 h: refs/heads/master i:   115165:
 419cbc292aafdc91a36d75a2051ff01a64dd7546   115163:
 1543a539bc73fda7b50e746a07a725b8034f194a   115159:
 e41c11d4f488ba5aacc6d2b33213753e446c8087   115151:
 89ed6906a8698a92c0a76e628ddd42ab0ddea1fd   115135:
 83b93201b84ace0f1066c3c896064efe1637fa86 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a48940879926..88ad8f5a78e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bebeff98ea960b13c4de95782c54f8e5e8b70fc
+refs/heads/master: a92946bc6abad6494ac95ea1a8b7c224b15fa1f7
diff --git a/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 5094677fd09e..baa52e261f0d 100644
--- a/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -21,6 +21,7 @@
 #include <linux/mm.h>
 
 #include <asm/blackfin.h>
+#include <asm/cacheflush.h>
 #include <asm/cplbinit.h>
 #include <asm/mmu_context.h>
 
@@ -144,9 +145,7 @@ static noinline int dcplb_miss(void)
 
 	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
-	if (addr < _ramend - DMA_UNCACHED_REGION ||
-	    (reserved_mem_dcache_on && addr >= _ramend &&
-	     addr < physical_mem_end)) {
+	if (bfin_addr_dcachable(addr)) {
 		d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;
 #ifdef CONFIG_BFIN_WT
 		d_data |= CPLB_L1_AOW | CPLB_WT;