cpu_reset() fix (Paul Brook)

diff --git a/target-arm/translate.c b/target-arm/translate.c
index a5eb3b4c72c38748f0a99a8bcb57e92c3c51cc98..089fbf2fd9d80cba2467603a6eb9d936e13c097c 100644 (file)
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2431,10 +2431,10 @@ int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
 void cpu_reset(CPUARMState *env)
 {
 #if defined (CONFIG_USER_ONLY)
+    env->uncached_cpsr = ARM_CPU_MODE_USR;
+#else
     /* SVC mode with interrupts disabled.  */
     env->uncached_cpsr = ARM_CPU_MODE_SVC | CPSR_A | CPSR_F | CPSR_I;
-#else
-    env->uncached_cpsr = ARM_CPU_MODE_USR;
 #endif
     env->regs[15] = 0;
 }