From patchwork Thu May 6 07:17:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 97281 X-Patchwork-Delegate: lethal@linux-sh.org 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 o467H7Ih025343 for ; Thu, 6 May 2010 07:17:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753097Ab0EFHRG (ORCPT ); Thu, 6 May 2010 03:17:06 -0400 Received: from mail.gmx.net ([213.165.64.20]:58094 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752136Ab0EFHRG (ORCPT ); Thu, 6 May 2010 03:17:06 -0400 Received: (qmail invoked by alias); 06 May 2010 07:17:02 -0000 Received: from p57BD22F8.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.34.248] by mail.gmx.net (mp058) with SMTP; 06 May 2010 09:17:02 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX19Pdt8qJfRPxvT09oFMNR7Zwt7mP7szmL788dEq4i BtS1gi7nhqxhJE Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1O9vKT-0001Ls-S8; Thu, 06 May 2010 09:17:05 +0200 Date: Thu, 6 May 2010 09:17:05 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Paul Mundt , Magnus Damm Subject: [PATCH] sh: balance recently added call to local_irq_disable() for cpuidle paths Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 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]); Thu, 06 May 2010 07:17:08 +0000 (UTC) diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c index e559687..874035f 100644 --- a/arch/sh/kernel/cpu/shmobile/pm.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c @@ -61,6 +61,7 @@ void sh_mobile_call_standby(unsigned long mode) if (mode & SUSP_SH_MMU) flush_cache_all(); + local_irq_enable(); /* Let assembly snippet in on-chip memory handle the rest */ standby_onchip_mem(mode, RAM_BASE);