From d69f5c7b50542ec9277f5552431caae41857c8dd Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 12 Dec 2009 14:27:40 +0000
Subject: [PATCH] --- yaml --- r: 177327 b: refs/heads/master c:
 a797a0e242b94548af8b41e6454349b515b66eca h: refs/heads/master i:   177325:
 ca492c728cf55fa82aaed5029ef8f774072d8541   177323:
 a3319fb7af440aa8437a97a9a4ddb44cad36e896   177319:
 67cfe2e1735b6b9a45920e967429c45d9850f787   177311:
 fb4ca35e3f3aa544270ad10060e129c67d5eeeda v: v3

---
 [refs]                                           |  2 +-
 trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5be475631c25..7356a8f527ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a68b5341de1d80cf0ec8e6c9a851e4bfd99787c
+refs/heads/master: a797a0e242b94548af8b41e6454349b515b66eca
diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c
index c9b0a4d53dc1..282a7919821b 100644
--- a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c
@@ -147,12 +147,13 @@ void __init generate_cplb_tables_all(void)
 	/* Normal RAM, including MTD FS.  */
 	icplb_bounds[i_i].eaddr = uncached_end;
 	icplb_bounds[i_i++].data = SDRAM_IGENERIC;
-	/* DMA uncached region.  */
-	if (DMA_UNCACHED_REGION) {
-		icplb_bounds[i_i].eaddr = _ramend;
-		icplb_bounds[i_i++].data = 0;
-	}
 	if (_ramend != physical_mem_end) {
+		/* DMA uncached region.  */
+		if (DMA_UNCACHED_REGION) {
+			/* Normally this hole is caught by the async below.  */
+			icplb_bounds[i_i].eaddr = _ramend;
+			icplb_bounds[i_i++].data = 0;
+		}
 		/* Reserved memory.  */
 		icplb_bounds[i_i].eaddr = physical_mem_end;
 		icplb_bounds[i_i++].data = (reserved_mem_icache_on ?