diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
| commit | 87314fb181f9042a226d721ab4a5579ddfca139c (patch) | |
| tree | b663e58cfe19ecf5003d4ea6e8048f6ae1925e9f /drivers/cpuidle | |
| parent | 2002d2951398317d0f46e64ae6d8dd58ed541c6d (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
| download | linux-87314fb181f9042a226d721ab4a5579ddfca139c.tar.bz2 | |
Merge tag 'v5.10-rc6' into x86/cache
Merge -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/cpuidle')
| -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; |