Merge branch 'pm-cpuidle'

rafaeljw · rafaeljw · commit 3a8ac4d39651 · 2020-11-19T14:02:18.000+01:00
* pm-cpuidle:
  cpuidle: tegra: Annotate tegra_pm_set_cpu_in_lp2() with RCU_NONIDLE
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`local_fiq_disable();`
`192`		`- tegra_pm_set_cpu_in_lp2();`
	`192`	`+ RCU_NONIDLE(tegra_pm_set_cpu_in_lp2());`
`193`	`193`	`cpu_pm_enter();`
`194`	`194`
`195`	`195`	`switch (index) {`
`@@ -207,7 +207,7 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`cpu_pm_exit();`
`210`		`- tegra_pm_clear_cpu_in_lp2();`
	`210`	`+ RCU_NONIDLE(tegra_pm_clear_cpu_in_lp2());`
`211`	`211`	`local_fiq_enable();`
`212`	`212`
`213`	`213`	`return err ?: index;`