1 files changed, 11 insertions, 0 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index f411eccf81..cddea532a4 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -274,6 +274,17 @@ int cpu_exec(CPUState *env1)
             return EXCP_HALTED;
         }
     }
+#elif defined(TARGET_ARM)
+    if (env1->halted) {
+        /* An interrupt wakes the CPU even if the I and F CPSR bits are
+           set.  */
+        if (env1->interrupt_request
+            & (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD)) {
+            env1->halted = 0;
+        } else {
+            return EXCP_HALTED;
+        }
+    }
 #endif
 
     cpu_single_env = env1;