From patchwork Tue Dec 1 22:00:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 64051 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB1M0KUJ025954 for ; Tue, 1 Dec 2009 22:00:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbZLAWAN (ORCPT ); Tue, 1 Dec 2009 17:00:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752749AbZLAWAN (ORCPT ); Tue, 1 Dec 2009 17:00:13 -0500 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:39957 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752667AbZLAWAM (ORCPT ); Tue, 1 Dec 2009 17:00:12 -0500 Received: from localhost (unknown [127.0.0.1]) by master.linux-sh.org (Postfix) with ESMTP id 253516375A; Tue, 1 Dec 2009 21:59:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at linux-sh.org Received: from master.linux-sh.org ([127.0.0.1]) by localhost (master.linux-sh.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 51eaKcV2Hczt; Wed, 2 Dec 2009 06:59:12 +0900 (JST) Received: from localhost (82-38-64-26.cable.ubr06.brad.blueyonder.co.uk [82.38.64.26]) by master.linux-sh.org (Postfix) with ESMTP id 2613E63758; Wed, 2 Dec 2009 06:59:11 +0900 (JST) Date: Tue, 1 Dec 2009 22:00:14 +0000 From: Matt Fleming To: Kuninori Morimoto Cc: Paul Mundt , Linux-SH Subject: Re: [PATCH] sh: mach-ecovec24: update ecovec24 defconfig Message-ID: <20091201220014.GA17935@console-pimps.org> References: <20091130025618.GB7217@linux-sh.org> <20091130195824.GA26460@console-pimps.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index 6bfd08d..0811358 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c @@ -117,14 +117,14 @@ static void sh4_flush_dcache_page(void *arg) else #endif { - unsigned long phys = page_to_phys(page); + unsigned long virt = (unsigned long)page_address(page); unsigned long addr = CACHE_OC_ADDRESS_ARRAY; int i, n; /* Loop all the D-cache */ n = boot_cpu_data.dcache.n_aliases; for (i = 0; i <= n; i++, addr += PAGE_SIZE) - flush_cache_one(addr, phys); + flush_cache_one(addr, virt); } wmb(); @@ -258,7 +258,7 @@ static void sh4_flush_cache_page(void *args) if (pages_do_alias(address, phys)) flush_cache_one(CACHE_OC_ADDRESS_ARRAY | - (address & shm_align_mask), phys); + (address & shm_align_mask), address); if (vma->vm_flags & VM_EXEC) flush_icache_all();