diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-11-19 14:02:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-11-19 14:02:18 +0100 |
| commit | 3a8ac4d39651c71d6d2f3376b13d0bad1484249a (patch) | |
| tree | d7ae66b344b0fe49e3a83187a4ed46fdcdd63bb4 | |
| parent | 14c620cf2ee81349527491110a47a157ac6d511c (diff) | |
| parent | c39de538a06e76d89b7e598a71e16688009cd56c (diff) | |
| download | lwn-3a8ac4d39651c71d6d2f3376b13d0bad1484249a.tar.gz lwn-3a8ac4d39651c71d6d2f3376b13d0bad1484249a.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: tegra: Annotate tegra_pm_set_cpu_in_lp2() with RCU_NONIDLE
| -rw-r--r-- | drivers/cpuidle/cpuidle-tegra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/cpuidle-tegra.c b/drivers/cpuidle/cpuidle-tegra.c index e8956706a291..191966dc8d02 100644 --- a/drivers/cpuidle/cpuidle-tegra.c +++ b/drivers/cpuidle/cpuidle-tegra.c @@ -189,7 +189,7 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev, } local_fiq_disable(); - tegra_pm_set_cpu_in_lp2(); + RCU_NONIDLE(tegra_pm_set_cpu_in_lp2()); cpu_pm_enter(); switch (index) { @@ -207,7 +207,7 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev, } cpu_pm_exit(); - tegra_pm_clear_cpu_in_lp2(); + RCU_NONIDLE(tegra_pm_clear_cpu_in_lp2()); local_fiq_enable(); return err ?: index; |