From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B241BC433E6 for ; Mon, 31 Aug 2020 15:35:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8875C20707 for ; Mon, 31 Aug 2020 15:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598888148; bh=aR6oCd9xnL61cRmpczx7OpnLHeesfGws1c6tF4Jg7TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C6bt/k2nY/a5b/0WnSA8wstKF5JJZ2gdL9vbI+hi30bFag/5oJpFu7E/YWXShtuLI pcQA8StwKLBxQwJmwvmPPNwiFZZXzjd/+xxMzyrKZsJaGNspvvKwyVqOehjosMJdji esDzgHkt1oL503ARS/zpob6HlfXoMuMSF3XifxT4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728798AbgHaPbG (ORCPT ); Mon, 31 Aug 2020 11:31:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:41398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728789AbgHaPbE (ORCPT ); Mon, 31 Aug 2020 11:31:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EFCF620FC3; Mon, 31 Aug 2020 15:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598887864; bh=aR6oCd9xnL61cRmpczx7OpnLHeesfGws1c6tF4Jg7TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F8lM138BaJIbhLyWurDWy8mMrjpwcyxhyVIFZOAl3c8PpKVGL3ZCUomF29Ekulyyv BhbYTgomeEMyXtB2ucqeBKRgAuWyreMz71B0xH5hfiRF6uHntdyz5YaGPGE7JNMri4 /ZfSSzPJO1TaqXn7FZthOVGuNrwYylx9TDuUBzQg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Zijlstra , Steven Rostedt , Thomas Gleixner , "Rafael J . Wysocki" , Marco Elver , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/23] cpuidle: Fixup IRQ state Date: Mon, 31 Aug 2020 11:30:31 -0400 Message-Id: <20200831153039.1024302-15-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200831153039.1024302-1-sashal@kernel.org> References: <20200831153039.1024302-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Peter Zijlstra [ Upstream commit 49d9c5936314e44d314c605c39cce0fd947f9c3a ] Match the pattern elsewhere in this file. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Steven Rostedt (VMware) Reviewed-by: Thomas Gleixner Acked-by: Rafael J. Wysocki Tested-by: Marco Elver Link: https://lkml.kernel.org/r/20200821085348.251340558@infradead.org Signed-off-by: Sasha Levin --- drivers/cpuidle/cpuidle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 29d2d7a21bd7b..73f08cda21e0e 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -148,7 +148,8 @@ static void enter_s2idle_proper(struct cpuidle_driver *drv, */ stop_critical_timings(); drv->states[index].enter_s2idle(dev, drv, index); - WARN_ON(!irqs_disabled()); + if (WARN_ON_ONCE(!irqs_disabled())) + local_irq_disable(); /* * timekeeping_resume() that will be called by tick_unfreeze() for the * first CPU executing it calls functions containing RCU read-side -- 2.25.1