diff mbox series

[4.14,08/65] cpuidle: Fixup IRQ state

Message ID	20200908152217.457938642@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=jcEg=CR=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, "Peter Zijlstra (Intel)" <peterz@infradead.org>, "Steven Rostedt (VMware)" <rostedt@goodmis.org>, Thomas Gleixner <tglx@linutronix.de>, "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, Marco Elver <elver@google.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 08/65] cpuidle: Fixup IRQ state Date: Tue, 8 Sep 2020 17:25:53 +0200 Message-Id: <20200908152217.457938642@linuxfoundation.org> In-Reply-To: <20200908152217.022816723@linuxfoundation.org> References: <20200908152217.022816723@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.14,02/65] HID: core: Sanitize event code and type when mapping input [4.14,03/65] perf record/stat: Explicitly call out event modifiers in the documentation [4.14,04/65] drm/msm: add shutdown support for display platform_driver [4.14,05/65] hwmon: (applesmc) check status earlier. [4.14,06/65] nvmet: Disable keep-alive timer when kato is cleared to 0h [4.14,07/65] ceph: dont allow setlease on cephfs [4.14,08/65] cpuidle: Fixup IRQ state [4.14,09/65] s390: dont trace preemption in percpu macros [4.14,10/65] xen/xenbus: Fix granting of vmallocd memory [4.14,11/65] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling [4.14,12/65] batman-adv: Avoid uninitialized chaddr when handling DHCP [4.14,13/65] batman-adv: Fix own OGM check in aggregated OGMs [4.14,14/65] batman-adv: bla: use netif_rx_ni when not in interrupt context [4.14,15/65] dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() [4.14,16/65] MIPS: mm: BMIPS5000 has inclusive physical caches [4.14,17/65] MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores [4.14,18/65] netfilter: nf_tables: add NFTA_SET_USERDATA if not null [4.14,19/65] netfilter: nf_tables: incorrect enum nft_list_attributes definition [4.14,20/65] netfilter: nf_tables: fix destination register zeroing [4.14,21/65] net: hns: Fix memleak in hns_nic_dev_probe [4.14,22/65] net: systemport: Fix memleak in bcm_sysport_probe [4.14,23/65] ravb: Fixed to be able to unload modules [4.14,24/65] net: arc_emac: Fix memleak in arc_mdio_probe [4.14,25/65] dmaengine: pl330: Fix burst length if burst size is smaller than bus width [4.14,26/65] gtp: add GTPA_LINK info to msg sent to userspace [4.14,27/65] bnxt_en: Check for zero dir entries in NVRAM. [4.14,28/65] bnxt_en: Fix PCI AER error recovery flow [4.14,29/65] nvmet-fc: Fix a missed _irqsave version of spin_lock in nvmet_fc_fod_op_done() [4.14,30/65] perf tools: Correct SNOOPX field offset [4.14,31/65] net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init() [4.14,32/65] fix regression in "epoll: Keep a reference on files added to the check list" [4.14,33/65] drm/radeon: Prefer lower feedback dividers [4.14,34/65] tg3: Fix soft lockup when tg3_reset_task() fails. [4.14,35/65] iommu/vt-d: Serialize IOMMU GCMD register modifications [4.14,36/65] thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 [4.14,37/65] include/linux/log2.h: add missing () around n in roundup_pow_of_two() [4.14,38/65] btrfs: drop path before adding new uuid tree entry [4.14,39/65] btrfs: Remove redundant extent_buffer_get in get_old_root [4.14,40/65] btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind [4.14,41/65] btrfs: set the lockdep class for log tree extent buffers [4.14,42/65] uaccess: Add non-pagefault user-space read functions [4.14,43/65] uaccess: Add non-pagefault user-space write function [4.14,44/65] btrfs: fix potential deadlock in the search ioctl [4.14,45/65] net: usb: qmi_wwan: add Telit 0x1050 composition [4.14,46/65] usb: qmi_wwan: add D-Link DWM-222 A2 device ID [4.14,47/65] ALSA: ca0106: fix error code handling [4.14,48/65] ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check [4.14,49/65] ALSA: hda/hdmi: always check pin power status in i915 pin fixup [4.14,50/65] ALSA: firewire-digi00x: exclude Avid Adrenaline from detection [4.14,51/65] affs: fix basic permission bits to actually work [4.14,52/65] block: allow for_each_bvec to support zero len bvec [4.14,53/65] block: Move SECTOR_SIZE and SECTOR_SHIFT definitions into <linux/blkdev.h> [4.14,54/65] libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks [4.14,55/65] dm cache metadata: Avoid returning cmd->bm wild pointer on error [4.14,56/65] dm thin metadata: Avoid returning cmd->bm wild pointer on error [4.14,57/65] mm: slub: fix conversion of freelist_corrupted() [4.14,58/65] KVM: arm64: Add kvm_extable for vaxorcism code [4.14,59/65] KVM: arm64: Defer guest entry when an asynchronous exception is pending [4.14,60/65] KVM: arm64: Survive synchronous exceptions caused by AT instructions [4.14,61/65] KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception [4.14,62/65] checkpatch: fix the usage of capture group ( ... ) [4.14,63/65] mm/hugetlb: fix a race between hugetlb sysctl handlers [4.14,64/65] cfg80211: regulatory: reject invalid hints [4.14,65/65] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()

Commit Message

Greg KH Sept. 8, 2020, 3:25 p.m. UTC

From: Peter Zijlstra <peterz@infradead.org>

[ Upstream commit 49d9c5936314e44d314c605c39cce0fd947f9c3a ]

Match the pattern elsewhere in this file.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Marco Elver <elver@google.com>
Link: https://lkml.kernel.org/r/20200821085348.251340558@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/cpuidle/cpuidle.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index ed4df58a855e1..da9eb38d79d9c 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -144,7 +144,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