From patchwork Fri Oct 24 19:06:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 5149301 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C7CEC9F349 for ; Fri, 24 Oct 2014 19:12:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECFBB20268 for ; Fri, 24 Oct 2014 19:12:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 320CD20265 for ; Fri, 24 Oct 2014 19:12:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XhkFo-0002nI-QD; Fri, 24 Oct 2014 19:10:28 +0000 Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XhkFj-0001WQ-Gw for linux-arm-kernel@lists.infradead.org; Fri, 24 Oct 2014 19:10:25 +0000 Received: by mail-lb0-f169.google.com with SMTP id 10so3051316lbg.14 for ; Fri, 24 Oct 2014 12:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=5ta9QKsqUE8/3DfOJt52iAuvoKAwB+iOT3rcHwz7pu4=; b=byg4L64yFFVE88xcQI6f6sRpCeoEoNBVqBxNE3JqelgXgcW0KzgIgfUrulhoZRsBB5 kqtwnv9NrjlrgjmQpS33UntlU73s+JAHmpRtUWPb3LqsasaYGdm6xySHi9M10QSW41Ty N6ZQkYvWXNWogD+If9m6ygSmHaRYq7HN5fC2D2mwlkfrZNSHQ1m9wUkDh+xX6MdCBAFk 0aCSDyhTuxi+nNrvP9Q4SLIJQYm3Nyt2DfV8s+gzUH1wjY9mCappjW52XF0+iB+BYTJ2 yLJhL6yMkxmI2KmajjBitI6Ss8DzAmGCSde6NzBYonpRwOaoipAGt5g1WgYmBoqUJUg2 e5mA== X-Received: by 10.152.20.199 with SMTP id p7mr6472887lae.49.1414177800483; Fri, 24 Oct 2014 12:10:00 -0700 (PDT) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id n7sm2140339lae.11.2014.10.24.12.09.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Oct 2014 12:09:59 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1XhkCS-0003nE-0I; Fri, 24 Oct 2014 21:07:00 +0200 From: Johan Hovold To: Russell King Subject: [PATCH] ARM: remove redundant irq disable at halt and restart Date: Fri, 24 Oct 2014 21:06:32 +0200 Message-Id: <1414177592-14547-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141024_121023_826674_30B367AE X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Felipe Balbi , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Johan Hovold X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove redundant local_irq_disable() at machine halt and restart. Since commit 44424c34049f ("ARM: 7803/1: Fix deadlock scenario with smp_send_stop()") interrupts are disabled before stopping secondary CPUs. Signed-off-by: Johan Hovold Reviewed-by: Felipe Balbi --- arch/arm/kernel/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index a35f6ebbd2c2..5663ab57cf07 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -195,7 +195,6 @@ void machine_halt(void) local_irq_disable(); smp_send_stop(); - local_irq_disable(); while (1); } @@ -237,7 +236,6 @@ void machine_restart(char *cmd) /* Whoops - the platform was unable to reboot. Tell the user! */ printk("Reboot failed -- System halted\n"); - local_irq_disable(); while (1); }