From 79e680052d10d60a642b0edc0c78bf7d1ab74f48 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Mon, 5 Oct 2009 20:30:32 +0200
Subject: [PATCH] x86: fix miss merge

There was a missmerge, and then we got a tail recursive call to cpu_post_load
without case base :)

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 target-i386/machine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target-i386/machine.c b/target-i386/machine.c
index c008209..b13eff4 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -383,7 +383,8 @@ static int cpu_post_load(void *opaque, int version_id)
         }
     }
 
-    return cpu_post_load(env, version_id);
+    tlb_flush(env, 1);
+    return 0;
 }
 
 const VMStateDescription vmstate_cpu = {
-- 
2.7.4