From eda48c344f35e5bd511dea3e8be56fb08c19b399 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 12 Mar 2011 17:43:56 +0100 Subject: inline cpu_halted into sole caller All implementations are now the same, and there is only one caller, so inline the function there. Signed-off-by: Paolo Bonzini Signed-off-by: Blue Swirl --- target-arm/exec.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'target-arm/exec.h') diff --git a/target-arm/exec.h b/target-arm/exec.h index e4c35a33eb..44e1b55aa2 100644 --- a/target-arm/exec.h +++ b/target-arm/exec.h @@ -32,19 +32,6 @@ static inline int cpu_has_work(CPUState *env) (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)); } -static inline int cpu_halted(CPUState *env) { - if (!env->halted) - return 0; - /* An interrupt wakes the CPU even if the I and F CPSR bits are - set. We use EXITTB to silently wake CPU without causing an - actual interrupt. */ - if (cpu_has_work(env)) { - env->halted = 0; - return 0; - } - return EXCP_HALTED; -} - #if !defined(CONFIG_USER_ONLY) #include "softmmu_exec.h" #endif -- cgit v1.2.3-55-g7522