From c98db2bdcbb8196ff5f1816cf834fd8c167facde Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 20 Jul 2012 02:03:42 +0100 Subject: [PATCH] --- yaml --- r: 321103 b: refs/heads/master c: 24b35521b8ddf088531258f06f681bb7b227bf47 h: refs/heads/master i: 321101: be6781a36c808b91b819e4d42ecd8cd69329736c 321099: 88eaefef0ad227c62df3847c20274b42387e9cd9 321095: 1aed6f91a92c5eb6fe4d9e9a852a45b0d0f37773 321087: db7025c55fd20854e5e5ba344ff16d8dbaaf1f3c v: v3 --- [refs] | 2 +- trunk/arch/arm/vfp/vfpmodule.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea383ac4dec8..09412361e39a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a84b895a2348f0dbff31b71ddf954f70a6cde368 +refs/heads/master: 24b35521b8ddf088531258f06f681bb7b227bf47 diff --git a/trunk/arch/arm/vfp/vfpmodule.c b/trunk/arch/arm/vfp/vfpmodule.c index 9428006728f2..fb849d044bde 100644 --- a/trunk/arch/arm/vfp/vfpmodule.c +++ b/trunk/arch/arm/vfp/vfpmodule.c @@ -457,6 +457,12 @@ 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 */