History

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

Linus Torvalds committed 10 years ago

Commit b80e8e22 parents ed385c7 bfc6b974 files · +11 −2Browse files

Unified · Split

4 files
  1. arch/x86/kernel/acpi/sleep.c +7 −0
  2. drivers/cpufreq/Kconfig +1 −0
  3. drivers/cpufreq/Kconfig.arm +2 −2
  4. drivers/cpufreq/mt8173-cpufreq.c +1 −0
arch/x86/kernel/acpi/sleep.c+7−0
@@ -16,6 +16,7 @@ · 15 unmodified lines
16#include <asm/cacheflush.h>16#include <asm/cacheflush.h>
17#include <asm/realmode.h>17#include <asm/realmode.h>
18 18
19#include <linux/ftrace.h>
19#include "../../realmode/rm/wakeup.h"20#include "../../realmode/rm/wakeup.h"
20#include "sleep.h"21#include "sleep.h"
21 22
@@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void) · 85 unmodified lines
107 saved_magic = 0x123456789abcdef0L;108 saved_magic = 0x123456789abcdef0L;
108#endif /* CONFIG_64BIT */109#endif /* CONFIG_64BIT */
109 110
111 /*
112 * Pause/unpause graph tracing around do_suspend_lowlevel as it has
113 * inconsistent call/return info after it jumps to the wakeup vector.
114 */
115 pause_graph_tracing();
110 do_suspend_lowlevel();116 do_suspend_lowlevel();
117 unpause_graph_tracing();
111 return 0;118 return 0;
112}119}
113 120
drivers/cpufreq/Kconfig+1−0
@@ -296,6 +296,7 @@ endif · 295 unmodified lines
296config QORIQ_CPUFREQ296config QORIQ_CPUFREQ
297 tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"297 tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"
298 depends on OF && COMMON_CLK && (PPC_E500MC || ARM)298 depends on OF && COMMON_CLK && (PPC_E500MC || ARM)
299 depends on !CPU_THERMAL || THERMAL
299 select CLK_QORIQ300 select CLK_QORIQ
300 help301 help
301 This adds the CPUFreq driver support for Freescale QorIQ SoCs302 This adds the CPUFreq driver support for Freescale QorIQ SoCs
drivers/cpufreq/Kconfig.arm+2−2
@@ -84,10 +84,10 @@ config ARM_KIRKWOOD_CPUFREQ · 83 unmodified lines
84 SoCs.84 SoCs.
85 85
86config ARM_MT8173_CPUFREQ86config ARM_MT8173_CPUFREQ
87 bool "Mediatek MT8173 CPUFreq support"87 tristate "Mediatek MT8173 CPUFreq support"
88 depends on ARCH_MEDIATEK && REGULATOR88 depends on ARCH_MEDIATEK && REGULATOR
89 depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)89 depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)
90 depends on !CPU_THERMAL || THERMAL=y90 depends on !CPU_THERMAL || THERMAL
91 select PM_OPP91 select PM_OPP
92 help92 help
93 This adds the CPUFreq driver support for Mediatek MT8173 SoC.93 This adds the CPUFreq driver support for Mediatek MT8173 SoC.
drivers/cpufreq/mt8173-cpufreq.c+1−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
17#include <linux/cpu_cooling.h>17#include <linux/cpu_cooling.h>
18#include <linux/cpufreq.h>18#include <linux/cpufreq.h>
19#include <linux/cpumask.h>19#include <linux/cpumask.h>
20#include <linux/module.h>
20#include <linux/of.h>21#include <linux/of.h>
21#include <linux/platform_device.h>22#include <linux/platform_device.h>
22#include <linux/pm_opp.h>23#include <linux/pm_opp.h>