History

Merge tag 'pm-5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki: "Fix three issues related to the handling of wakeup events signaled through the ACPI SCI while suspended to idle (Rafael Wysocki) and unexport an internal cpufreq variable (Yangtao Li)" * tag 'pm-5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system ACPICA: Introduce acpi_any_gpe_status_set() ACPI: PM: s2idle: Avoid possible race related to the EC GPE ACPI: EC: Fix flushing of pending work cpufreq: Make cpufreq_global_kobject static

Linus Torvalds committed 6 years ago

Commit 4e03e4e2 parents 81f3011 3629ac510 files · +177 −42Browse files

Showing the changes to include/linux (2 of 10 files). Show all

Unified · Split

2 files
  1. include/linux/cpufreq.h +0 −3
  2. include/linux/suspend.h +1 −1
include/linux/cpufreq.h+0−3
@@ -201,9 +201,6 @@ static inline bool policy_is_shared(struct cpufreq_policy *policy) · 200 unmodified lines
201201 return cpumask_weight(policy->cpus) > 1;
202202 }
203203
204−/* /sys/devices/system/cpu/cpufreq: entry point for global variables */
205−extern struct kobject *cpufreq_global_kobject;
206−
207204 #ifdef CONFIG_CPU_FREQ
208205 unsigned int cpufreq_get(unsigned int cpu);
209206 unsigned int cpufreq_quick_get(unsigned int cpu);
include/linux/suspend.h+1−1
@@ -191,7 +191,7 @@ struct platform_s2idle_ops { · 190 unmodified lines
191191 int (*begin)(void);
192192 int (*prepare)(void);
193193 int (*prepare_late)(void);
194− void (*wake)(void);
194+ bool (*wake)(void);
195195 void (*restore_early)(void);
196196 void (*restore)(void);
197197 void (*end)(void);