diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-30 13:29:13 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-30 13:29:13 -0700 |
| commit | 03fb8f57c5dd5530c5bcfcd3eabc632456accf75 (patch) | |
| tree | a6cb5964cfc3a69c411f1ef4189ef9f0500962e9 /arch/arm/vfp | |
| parent | 2eab27c7996d0c9de0708a3ebfe46ae8f7a8a42b (diff) | |
| parent | 80b8354d535d2e8d6ced0b0e129257dba1fb2130 (diff) | |
| download | kernel_samsung_tuna-03fb8f57c5dd5530c5bcfcd3eabc632456accf75.zip kernel_samsung_tuna-03fb8f57c5dd5530c5bcfcd3eabc632456accf75.tar.gz kernel_samsung_tuna-03fb8f57c5dd5530c5bcfcd3eabc632456accf75.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/vfp')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index bfd1e2f..e37c5fd 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -418,13 +418,15 @@ static int vfp_pm_suspend(void) /* disable, just in case */ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); } else if (vfp_current_hw_state[ti->cpu]) { +#ifndef CONFIG_SMP fmxr(FPEXC, fpexc | FPEXC_EN); vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc); fmxr(FPEXC, fpexc); +#endif } /* clear any information we had about last context state */ - memset(vfp_current_hw_state, 0, sizeof(vfp_current_hw_state)); + vfp_current_hw_state[ti->cpu] = NULL; return 0; } |