History

Merge branches 'pm-sleep', 'pm-cpuidle', 'pm-cpufreq', 'pm-devfreq' and 'pm-avs'

* pm-sleep: ACPI: PM: s2idle: Rework ACPI events synchronization ACPI: EC: Rework flushing of pending work * pm-cpuidle: cpuidle: minor Kconfig help text fixes cpuidle: Drop disabled field from struct cpuidle_state cpuidle: Fix Kconfig indentation * pm-cpufreq: cpufreq: Fix Kconfig indentation * pm-devfreq: PM / devfreq: Add missing locking while setting suspend_freq * pm-avs: power: avs: Fix Kconfig indentation

Rafael J. Wysocki committed 6 years ago

Commit 1e4230f6 parents 36a8015 024aa87 4d30d4a cde10f8 e1e047a 2a0efc713 files · +82 −77Browse files

Showing the changes to include/linux (1 of 13 files). Show all

Unified · Split

include/linux/cpuidle.h+1−1
@@ -54,7 +54,6 @@ struct cpuidle_state { · 53 unmodified lines
54 unsigned int exit_latency; /* in US */54 unsigned int exit_latency; /* in US */
55 int power_usage; /* in mW */55 int power_usage; /* in mW */
56 unsigned int target_residency; /* in US */56 unsigned int target_residency; /* in US */
57 bool disabled; /* disabled on all CPUs */
58 57
59 int (*enter) (struct cpuidle_device *dev,58 int (*enter) (struct cpuidle_device *dev,
60 struct cpuidle_driver *drv,59 struct cpuidle_driver *drv,
@@ -77,6 +76,7 @@ struct cpuidle_state { · 16 unmodified lines
77#define CPUIDLE_FLAG_POLLING BIT(0) /* polling state */76#define CPUIDLE_FLAG_POLLING BIT(0) /* polling state */
78#define CPUIDLE_FLAG_COUPLED BIT(1) /* state applies to multiple cpus */77#define CPUIDLE_FLAG_COUPLED BIT(1) /* state applies to multiple cpus */
79#define CPUIDLE_FLAG_TIMER_STOP BIT(2) /* timer is stopped on this state */78#define CPUIDLE_FLAG_TIMER_STOP BIT(2) /* timer is stopped on this state */
79#define CPUIDLE_FLAG_UNUSABLE BIT(3) /* avoid using this state */
80 80
81struct cpuidle_device_kobj;81struct cpuidle_device_kobj;
82struct cpuidle_state_kobj;82struct cpuidle_state_kobj;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t