Merge tag 'audit-pr-20230220' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[platform/kernel/linux-starfive.git] / kernel / cpu_pm.c

diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c
index ba4ba71..b0f0d15 100644 (file)
--- a/kernel/cpu_pm.c
+++ b/kernel/cpu_pm.c
@@ -30,16 +30,9 @@ static int cpu_pm_notify(enum cpu_pm_event event)
 {
        int ret;
 
-       /*
-        * This introduces a RCU read critical section, which could be
-        * disfunctional in cpu idle. Copy RCU_NONIDLE code to let RCU know
-        * this.
-        */
-       ct_irq_enter_irqson();
        rcu_read_lock();
        ret = raw_notifier_call_chain(&cpu_pm_notifier.chain, event, NULL);
        rcu_read_unlock();
-       ct_irq_exit_irqson();
 
        return notifier_to_errno(ret);
 }
@@ -49,11 +42,9 @@ static int cpu_pm_notify_robust(enum cpu_pm_event event_up, enum cpu_pm_event ev
        unsigned long flags;
        int ret;
 
-       ct_irq_enter_irqson();
        raw_spin_lock_irqsave(&cpu_pm_notifier.lock, flags);
        ret = raw_notifier_call_chain_robust(&cpu_pm_notifier.chain, event_up, event_down, NULL);
        raw_spin_unlock_irqrestore(&cpu_pm_notifier.lock, flags);
-       ct_irq_exit_irqson();
 
        return notifier_to_errno(ret);
 }