Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b80e8e28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI fixes from Rafael Wysocki:
 "Two build fixes for cpufreq drivers (including one for breakage
  introduced recently) and a fix for a graph tracer crash when used over
  suspend-to-RAM on x86.

  Specifics:

   - Prevent the graph tracer from crashing when used over suspend-to-
     RAM on x86 by pausing it before invoking do_suspend_lowlevel() and
     un-pausing it when that function has returned (Todd Brandt).

   - Fix build issues in the qoriq and mediatek cpufreq drivers related
     to broken dependencies on THERMAL (Arnd Bergmann)"

* tag 'pm+acpi-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / sleep / x86: Fix crash on graph trace through x86 suspend
  cpufreq: mediatek: allow building as a module
  cpufreq: qoriq: allow building as module with THERMAL=m
parents ed385c7a bfc6b97d

arch/x86/kernel/acpi/sleep.c

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/cacheflush.h>

#include <asm/realmode.h>



#include <linux/ftrace.h>

#include "../../realmode/rm/wakeup.h"

#include "sleep.h"
@@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void) 
       saved_magic = 0x123456789abcdef0L;

#endif /* CONFIG_64BIT */



	/*

	 * Pause/unpause graph tracing around do_suspend_lowlevel as it has

	 * inconsistent call/return info after it jumps to the wakeup vector.

	 */

	pause_graph_tracing();

	do_suspend_lowlevel();

	unpause_graph_tracing();

	return 0;

}

drivers/cpufreq/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ endif 
config QORIQ_CPUFREQ

	tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"

	depends on OF && COMMON_CLK && (PPC_E500MC || ARM)

	depends on !CPU_THERMAL || THERMAL

	select CLK_QORIQ

	help

	  This adds the CPUFreq driver support for Freescale QorIQ SoCs

drivers/cpufreq/Kconfig.arm

+2 −2
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ config ARM_KIRKWOOD_CPUFREQ 
	  SoCs.



config ARM_MT8173_CPUFREQ

	bool "Mediatek MT8173 CPUFreq support"

	tristate "Mediatek MT8173 CPUFreq support"

	depends on ARCH_MEDIATEK && REGULATOR

	depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)

	depends on !CPU_THERMAL || THERMAL=y

	depends on !CPU_THERMAL || THERMAL

	select PM_OPP

	help

	  This adds the CPUFreq driver support for Mediatek MT8173 SoC.

drivers/cpufreq/mt8173-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/cpu_cooling.h>

#include <linux/cpufreq.h>

#include <linux/cpumask.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pm_opp.h>