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

include/linux/cpufreq.h +0 −3
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
201	return cpumask_weight(policy->cpus) > 1;	201	return cpumask_weight(policy->cpus) > 1;
202	}	202	}
203		203
204	/* /sys/devices/system/cpu/cpufreq: entry point for global variables */
205	extern struct kobject *cpufreq_global_kobject;
206
207	#ifdef CONFIG_CPU_FREQ	204	#ifdef CONFIG_CPU_FREQ
208	unsigned int cpufreq_get(unsigned int cpu);	205	unsigned int cpufreq_get(unsigned int cpu);
209	unsigned int cpufreq_quick_get(unsigned int cpu);	206	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
191	int (*begin)(void);	191	int (*begin)(void);
192	int (*prepare)(void);	192	int (*prepare)(void);
193	int (*prepare_late)(void);	193	int (*prepare_late)(void);
194	void (*wake)(void);	194	bool (*wake)(void);
195	void (*restore_early)(void);	195	void (*restore_early)(void);
196	void (*restore)(void);	196	void (*restore)(void);
197	void (*end)(void);	197	void (*end)(void);