mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'
* pm-cpufreq-fixes: cpufreq: mediatek: allow building as a module cpufreq: qoriq: allow building as module with THERMAL=m * pm-sleep-fixes: PM / sleep / x86: Fix crash on graph trace through x86 suspend
This commit is contained in:
commit
bfc6b97d52
4 changed files with 11 additions and 2 deletions
|
@ -16,6 +16,7 @@
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/realmode.h>
|
#include <asm/realmode.h>
|
||||||
|
|
||||||
|
#include <linux/ftrace.h>
|
||||||
#include "../../realmode/rm/wakeup.h"
|
#include "../../realmode/rm/wakeup.h"
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
|
|
||||||
|
@ -107,7 +108,13 @@ int x86_acpi_suspend_lowlevel(void)
|
||||||
saved_magic = 0x123456789abcdef0L;
|
saved_magic = 0x123456789abcdef0L;
|
||||||
#endif /* CONFIG_64BIT */
|
#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();
|
do_suspend_lowlevel();
|
||||||
|
unpause_graph_tracing();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -296,6 +296,7 @@ endif
|
||||||
config QORIQ_CPUFREQ
|
config QORIQ_CPUFREQ
|
||||||
tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"
|
tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"
|
||||||
depends on OF && COMMON_CLK && (PPC_E500MC || ARM)
|
depends on OF && COMMON_CLK && (PPC_E500MC || ARM)
|
||||||
|
depends on !CPU_THERMAL || THERMAL
|
||||||
select CLK_QORIQ
|
select CLK_QORIQ
|
||||||
help
|
help
|
||||||
This adds the CPUFreq driver support for Freescale QorIQ SoCs
|
This adds the CPUFreq driver support for Freescale QorIQ SoCs
|
||||||
|
|
|
@ -84,10 +84,10 @@ config ARM_KIRKWOOD_CPUFREQ
|
||||||
SoCs.
|
SoCs.
|
||||||
|
|
||||||
config ARM_MT8173_CPUFREQ
|
config ARM_MT8173_CPUFREQ
|
||||||
bool "Mediatek MT8173 CPUFreq support"
|
tristate "Mediatek MT8173 CPUFreq support"
|
||||||
depends on ARCH_MEDIATEK && REGULATOR
|
depends on ARCH_MEDIATEK && REGULATOR
|
||||||
depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)
|
depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)
|
||||||
depends on !CPU_THERMAL || THERMAL=y
|
depends on !CPU_THERMAL || THERMAL
|
||||||
select PM_OPP
|
select PM_OPP
|
||||||
help
|
help
|
||||||
This adds the CPUFreq driver support for Mediatek MT8173 SoC.
|
This adds the CPUFreq driver support for Mediatek MT8173 SoC.
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <linux/cpu_cooling.h>
|
#include <linux/cpu_cooling.h>
|
||||||
#include <linux/cpufreq.h>
|
#include <linux/cpufreq.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
|
#include <linux/module.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/pm_opp.h>
|
#include <linux/pm_opp.h>
|
||||||
|
|
Loading…
Reference in a new issue