diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index 3a35e843..d88d377e 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -539,9 +539,5 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
     // TODO: optimize this for better performance
     tb_flush(cpu);
 
-    /* fail safe : never use current_cpu outside cpu_exec() */
-    atomic_set(&uc->current_cpu, NULL);
-    /* Does not need atomic_mb_set because a spurious wakeup is okay.  */
-    atomic_set(&uc->tcg_current_rr_cpu, NULL);
     return ret;
 }
diff --git a/qemu/translate-all.c b/qemu/translate-all.c
index bef5a154..d92d9afe 100644
--- a/qemu/translate-all.c
+++ b/qemu/translate-all.c
@@ -78,7 +78,7 @@
  * mmap_lock.
  */
 #ifdef CONFIG_SOFTMMU
-#define assert_memory_lock() do { /* nothing */ } while (0)
+#define assert_memory_lock() tcg_debug_assert(have_tb_lock)
 #else
 #define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
 #endif