diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-05 13:11:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-05 13:11:17 +0200 |
| commit | 0b9688ee95c123e2dc4449ef667abe4209e55ee4 (patch) | |
| tree | 24789691fd15fd0846e9d7bad4af869be3bbd370 /include | |
| parent | ARM: imx6q: Fixup RCU usage for cpuidle (diff) | |
| parent | Merge back cpuidle material for 5.10. (diff) | |
| download | linux-0b9688ee95c123e2dc4449ef667abe4209e55ee4.tar.xz linux-0b9688ee95c123e2dc4449ef667abe4209e55ee4.zip | |
Merge back cpuidle material for 5.10.
* pm-cpuidle:
cpuidle: record state entry rejection statistics
cpuidle: psci: Allow PM domain to be initialized even if no OSI mode
firmware: psci: Extend psci_set_osi_mode() to allow reset to PC mode
ACPI: processor: Print more information when acpi_processor_evaluate_cst() fails
cpuidle: tegra: Correctly handle result of arm_cpuidle_simple_enter()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 1 | ||||
| -rw-r--r-- | include/linux/psci.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 6175c77bf25e..ed0da0e58e8b 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -38,6 +38,7 @@ struct cpuidle_state_usage { u64 time_ns; unsigned long long above; /* Number of times it's been too deep */ unsigned long long below; /* Number of times it's been too shallow */ + unsigned long long rejected; /* Number of times idle entry was rejected */ #ifdef CONFIG_SUSPEND unsigned long long s2idle_usage; unsigned long long s2idle_time; /* in US */ diff --git a/include/linux/psci.h b/include/linux/psci.h index 14ad9b9ebcd6..2a1bfb890e58 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -18,7 +18,7 @@ bool psci_tos_resident_on(int cpu); int psci_cpu_suspend_enter(u32 state); bool psci_power_state_is_valid(u32 state); -int psci_set_osi_mode(void); +int psci_set_osi_mode(bool enable); bool psci_has_osi_support(void); struct psci_operations { |