summaryrefslogtreecommitdiff
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-09-28 17:31:25 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-09-28 17:31:25 +0300
commitf3643b5b77f26865b566c867b1aa99d1ba903cd0 (patch)
tree5e8f10c1916aa011d7785abd79e5053c8fd9fc0b /drivers/cpuidle/cpuidle.c
parentf49735f4978f479b0de4f50ab217d5a56bc83c55 (diff)
parent955921289dcdbc49b46a731ec07978fb7d4e1fc7 (diff)
downloadlinux-f3643b5b77f26865b566c867b1aa99d1ba903cd0.tar.xz
Merge back cpuidle material for 5.10.
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 0ed5030b89d6..83af15f77f66 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -142,11 +142,6 @@ static void enter_s2idle_proper(struct cpuidle_driver *drv,
time_start = ns_to_ktime(local_clock());
- /*
- * trace_suspend_resume() called by tick_freeze() for the last CPU
- * executing it contains RCU usage regarded as invalid in the idle
- * context, so tell RCU about that.
- */
tick_freeze();
/*
* The state used here cannot be a "coupled" one, because the "coupled"
@@ -159,11 +154,6 @@ static void enter_s2idle_proper(struct cpuidle_driver *drv,
target_state->enter_s2idle(dev, drv, index);
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
- * critical sections, so tell RCU about that.
- */
if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE))
rcu_idle_exit();
tick_unfreeze();