Merge "msm: pm: Remove jtag save/restore from msm-pm"

This commit is contained in:
Linux Build Service Account 2015-08-13 11:32:23 -07:00 committed by Gerrit - the friendly Code Review server
commit a2adbee01c

View file

@ -40,7 +40,6 @@
#ifdef CONFIG_VFP #ifdef CONFIG_VFP
#include <asm/vfp.h> #include <asm/vfp.h>
#endif #endif
#include <soc/qcom/jtag.h>
#include "idle.h" #include "idle.h"
#include "pm-boot.h" #include "pm-boot.h"
#include "../../../arch/arm/mach-msm/clock.h" #include "../../../arch/arm/mach-msm/clock.h"
@ -267,13 +266,9 @@ static bool __ref msm_pm_spm_power_collapse(
pr_info("CPU%u: %s: program vector to %p\n", pr_info("CPU%u: %s: program vector to %p\n",
cpu, __func__, entry); cpu, __func__, entry);
msm_jtag_save_state();
collapsed = save_cpu_regs ? collapsed = save_cpu_regs ?
!__cpu_suspend(0, msm_pm_collapse) : msm_pm_pc_hotplug(); !__cpu_suspend(0, msm_pm_collapse) : msm_pm_pc_hotplug();
msm_jtag_restore_state();
if (collapsed) if (collapsed)
local_fiq_enable(); local_fiq_enable();