From 01d7a94eef2b9f6f9535e6816c29e7dfdcf31fd4 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 9 Sep 2009 14:10:28 +0900
Subject: [PATCH] --- yaml --- r: 173372 b: refs/heads/master c:
 31c9efde786252112cc3d04a1ed3513b6ec63a7b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/mm/cache-sh4.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a95f51d9d227..ce06c05aced0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 654d364e26c797e8a5f9e2a1393607e6ca0106eb
+refs/heads/master: 31c9efde786252112cc3d04a1ed3513b6ec63a7b
diff --git a/trunk/arch/sh/mm/cache-sh4.c b/trunk/arch/sh/mm/cache-sh4.c
index a5c339bca8aa..f0999606686f 100644
--- a/trunk/arch/sh/mm/cache-sh4.c
+++ b/trunk/arch/sh/mm/cache-sh4.c
@@ -123,12 +123,12 @@ static void sh4_flush_dcache_page(void *arg)
 	else
 #endif
 	{
-		unsigned long phys = PHYSADDR(page_address(page));
+		unsigned long phys = page_to_phys(page);
 		unsigned long addr = CACHE_OC_ADDRESS_ARRAY;
 		int i, n;
 
 		/* Loop all the D-cache */
-		n = boot_cpu_data.dcache.n_aliases;
+		n = boot_cpu_data.dcache.way_incr >> 12;
 		for (i = 0; i < n; i++, addr += 4096)
 			flush_cache_4096(addr, phys);
 	}