From patchwork Tue Jun 8 02:00:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 104852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5820wjZ024453 for ; Tue, 8 Jun 2010 02:00:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751435Ab0FHCA5 (ORCPT ); Mon, 7 Jun 2010 22:00:57 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:51659 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897Ab0FHCA5 (ORCPT ); Mon, 7 Jun 2010 22:00:57 -0400 Received: by iwn37 with SMTP id 37so4095449iwn.19 for ; Mon, 07 Jun 2010 19:00:56 -0700 (PDT) Received: by 10.231.193.209 with SMTP id dv17mr5395037ibb.134.1275962456232; Mon, 07 Jun 2010 19:00:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.39.139 with HTTP; Mon, 7 Jun 2010 19:00:36 -0700 (PDT) From: Nobuhiro Iwamatsu Date: Tue, 8 Jun 2010 11:00:36 +0900 X-Google-Sender-Auth: p06le6KoaRkrruU-j_w2U3_QTq4 Message-ID: Subject: [PATCH 2/2] sh: Fix reboot on 32bit boot mode To: Linux-sh Cc: Paul Mundt Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 08 Jun 2010 02:00:58 +0000 (UTC) diff --git a/arch/sh/kernel/reboot.c b/arch/sh/kernel/reboot.c index b1fca66..541fb39 100644 --- a/arch/sh/kernel/reboot.c +++ b/arch/sh/kernel/reboot.c @@ -9,6 +9,7 @@ #include #include #include +#include void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -25,6 +26,11 @@ static void native_machine_restart(char * __unused) { local_irq_disable(); +#ifdef CONFIG_PMB + /* PMB entry clear. */ + writel(MMUCR_TI, MMUCR); +#endif + /* Address error with SR.BL=1 first. */ trigger_address_error();