Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

[qemu.git] / target-cris / translate_v10.c

diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c
index d2cca892e0874c2b22d1a133a184a508c5ce61c9..d6ef084483a1327809b24356e655ac5119a961b3 100644 (file)
--- a/target-cris/translate_v10.c
+++ b/target-cris/translate_v10.c
@@ -1257,7 +1257,7 @@ static unsigned int crisv10_decoder(CPUCRISState *env, DisasContext *dc)
     return insn_len;
 }
 
-static CPUCRISState *cpu_crisv10_init (CPUCRISState *env)
+void cris_initialize_crisv10_tcg(void)
 {
        int i;
 
@@ -1300,7 +1300,4 @@ static CPUCRISState *cpu_crisv10_init (CPUCRISState *env)
                                               offsetof(CPUCRISState, pregs[i]),
                                               pregnames_v10[i]);
        }
-
-       return env;
 }
-