Merge branch 'develop' into develop_qemu_2.7

Change-Id: If718c77de19a889746a25a2dd51881dce52ef4b4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/cpus.c b/cpus.c
index 7c51e7e9d3..4d51e317a5 100644
--- a/cpus.c
+++ b/cpus.c
@@ -712,6 +712,11 @@ void cpu_synchronize_all_states(void)
 
     CPU_FOREACH(cpu) {
         cpu_synchronize_state(cpu);
+#ifdef CONFIG_HAX
+        if (hax_enabled() && hax_ug_platform()) {
+            hax_cpu_synchronize_state(cpu);
+        }
+#endif
     }
 }