---

yaml --- r: 321103 b: refs/heads/master c: 24b3552 h: refs/heads/master i: 321101: be6781a 321099: 88eaefe 321095: 1aed6f9 321087: db7025c v: v3
git-mirror · Jul 31, 2012 · c98db2b · c98db2b
1 parent 68e2cf3
commit c98db2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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 */