diff --git a/qemu/target-arm/cpu.c b/qemu/target-arm/cpu.c
index ef9df339..7a0b8393 100644
--- a/qemu/target-arm/cpu.c
+++ b/qemu/target-arm/cpu.c
@@ -29,16 +29,14 @@
 
 static void arm_cpu_set_pc(CPUState *cs, vaddr value)
 {
-    CPUARMState *env = cs->env_ptr;
-    ARMCPU *cpu = ARM_CPU(env->uc, cs);
+    ARMCPU *cpu = ARM_CPU(NULL, cs);
 
     cpu->env.regs[15] = value;
 }
 
 static bool arm_cpu_has_work(CPUState *cs)
 {
-    CPUARMState *env = cs->env_ptr;
-    ARMCPU *cpu = ARM_CPU(env->uc, cs);
+    ARMCPU *cpu = ARM_CPU(NULL, cs);
 
     return !cpu->powered_off
         && cs->interrupt_request &
diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c
index fe7bddd7..93521029 100644
--- a/qemu/target-arm/helper.c
+++ b/qemu/target-arm/helper.c
@@ -3157,7 +3157,7 @@ uint32_t HELPER(rbit)(uint32_t x)
 int arm_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,
                              int mmu_idx)
 {
-    ARMCPU *cpu = ARM_CPU(cs);
+    ARMCPU *cpu = ARM_CPU(NULL, cs);
     CPUARMState *env = &cpu->env;
 
     env->exception.vaddress = address;
@@ -4335,7 +4335,7 @@ int arm_cpu_handle_mmu_fault(CPUState *cs, vaddr address,
 
 hwaddr arm_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
 {
-    ARMCPU *cpu = ARM_CPU(env->uc, cs);
+    ARMCPU *cpu = ARM_CPU(NULL, cs);
     hwaddr phys_addr;
     target_ulong page_size;
     int prot;