From b87e29d00bae2caa9c664d1117a1b61887034780 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 4 Aug 2009 15:57:44 +0900
Subject: [PATCH] --- yaml --- r: 163351 b: refs/heads/master c:
 700487c158163f14e6ff10de770b565c1c993c69 h: refs/heads/master i:   163349:
 c74046101c334f5cfdf0d75ea1b143cd21c21b63   163347:
 cbb089209c7132401ed9a4362c1c8b0edd0de7ad   163343:
 c73622d640385ad9fa1d4b41958f70a2c7b65e09 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/sh/mm/pg-mmu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf756b0fa2ad..c22222492b53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ed6e129390fb872c3b7e05a232e5d380fbdfb48
+refs/heads/master: 700487c158163f14e6ff10de770b565c1c993c69
diff --git a/trunk/arch/sh/mm/pg-mmu.c b/trunk/arch/sh/mm/pg-mmu.c
index 8602f68af4c8..32351206edd3 100644
--- a/trunk/arch/sh/mm/pg-mmu.c
+++ b/trunk/arch/sh/mm/pg-mmu.c
@@ -37,6 +37,8 @@ static inline void *kmap_coherent(struct page *page, unsigned long addr)
 	unsigned long vaddr, flags;
 	pte_t pte;
 
+	BUG_ON(test_bit(PG_dcache_dirty, &page->flags));
+
 	inc_preempt_count();
 
 	idx = (addr & current_cpu_data.dcache.alias_mask) >> PAGE_SHIFT;