diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /arch/arm/vfp/vfpmodule.c | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'arch/arm/vfp/vfpmodule.c')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 8383b7a1e90a..e381dc68505d 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -184,11 +184,11 @@ static int vfp_cpu_pm_notifier(struct notifier_block *self, unsigned long cmd, switch (cmd) { case CPU_PM_ENTER: - if (last_VFP_context[cpu]) { + if (vfp_current_hw_state[cpu]) { fmxr(FPEXC, fpexc | FPEXC_EN); - vfp_save_state(last_VFP_context[cpu], fpexc); + vfp_save_state(vfp_current_hw_state[cpu], fpexc); /* force a reload when coming back from idle */ - last_VFP_context[cpu] = NULL; + vfp_current_hw_state[cpu] = NULL; fmxr(FPEXC, fpexc & ~FPEXC_EN); } break; @@ -442,7 +442,7 @@ static int vfp_pm_suspend(void) u32 fpexc = fmrx(FPEXC); /* If lazy disable, re-enable the VFP ready for it to be saved */ - if (last_VFP_context[ti->cpu] != &ti->vfpstate) { + if (vfp_current_hw_state[ti->cpu] != &ti->vfpstate) { fpexc |= FPEXC_EN; fmxr(FPEXC, fpexc); } |