nios2: do not include exec-all.h from cpu.h

exec-all.h contains TCG-specific declarations, it should only be
includer from helper C files.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 145796e8cedae39346e499c24435bb63d975de59..047f3764b7d3034595db55052101c21897938005 100644 (file)
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -260,7 +260,6 @@ static inline int cpu_interrupts_enabled(CPUNios2State *env)
 }
 
 #include "exec/cpu-all.h"
-#include "exec/exec-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUNios2State *env, target_ulong *pc,
                                         target_ulong *cs_base, uint32_t *flags)

diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c
index c853aeae0297cea32a0148a5c1ea3bb462c32e73..529ec6ac0e78906b2a3e5dea69b26bdc35663db0 100644 (file)
--- a/target/nios2/op_helper.c
+++ b/target/nios2/op_helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
+#include "exec/exec-all.h"
 #include "qemu/main-loop.h"
 
 #if !defined(CONFIG_USER_ONLY)