Merge tag 'pm-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (daf6b9b6) · Commits · 戴 / test

Pull power management fixes from Rafael Wysocki: "This includes a PM QoS framework fix from Tejun to prevent interrupts from being enabled unexpectedly during early boot and a cpufreq documentation fix. Specifics: - If the PM QoS framework invokes cancel_delayed_work_sync() during early boot, it will enable interrupts which is not expected at that point, so prevent it from happening (Tejun Heo) - Fix cpufreq statistic documentation to follow a recent change in behavior that forgot to update it as appropriate (Jean Delvare)" * tag 'pm-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq-stats: Minor documentation fix PM / QoS: avoid calling cancel_delayed_work_sync() during early boot

Documentation/cpu-freq/cpufreq-stats.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ Config Main Menu
		Power management options (ACPI, APM) --->
		CPU Frequency scaling --->
		[*] CPU Frequency scaling
		<*> CPU frequency translation statistics
		[*] CPU frequency translation statistics
		[*] CPU frequency translation statistics details

kernel/power/qos.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -482,7 +482,16 @@ void pm_qos_update_request(struct pm_qos_request *req,
		return;
		}

		/*
		* This function may be called very early during boot, for example,
		* from of_clk_init(), where irq needs to stay disabled.
		* cancel_delayed_work_sync() assumes that irq is enabled on
		* invocation and re-enables it on return. Avoid calling it until
		* workqueue is initialized.
		*/
		if (keventd_up())
		cancel_delayed_work_sync(&req->work);

		__pm_qos_update_request(req, new_value);
		}
		EXPORT_SYMBOL_GPL(pm_qos_update_request);

Admin message