aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-07 15:19:20 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-07 15:19:20 +0000
commit84a031c68fd657f2973e7c2ce0207588c66fbd58 (patch)
tree097fb47eb23e81a7bd2cc6418be24a44ede87e64
parente7786f27c39f9bb9f75c71246d4993e4a8778758 (diff)
Fix cpu_arm_handle_mmu_fault warning
This patch fixes: /scratch/froydnj/qemu.git/target-arm/helper.c:451: warning: no previous prototype for 'cpu_arm_handle_mmu_fault' by moving the declaration of the function to cpu.h from exec.h. cpu.h seems to be the place most other ports declare the corresponding function. Signed-off-by: Nathan Froyd <froydnj@codesourcery.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6550 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--target-arm/cpu.h2
-rw-r--r--target-arm/exec.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 54c2c2e3f8..cab80cdfe6 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -217,6 +217,8 @@ uint32_t do_arm_semihosting(CPUARMState *env);
is returned if the signal was handled by the virtual CPU. */
int cpu_arm_signal_handler(int host_signum, void *pinfo,
void *puc);
+int cpu_arm_handle_mmu_fault (CPUARMState *env, target_ulong address, int rw,
+ int mmu_idx, int is_softmuu);
void cpu_lock(void);
void cpu_unlock(void);
diff --git a/target-arm/exec.h b/target-arm/exec.h
index b70e0cbc2a..3e4083a61b 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -37,9 +37,6 @@ static inline void regs_to_env(void)
{
}
-int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
- int mmu_idx, int is_softmmu);
-
static inline int cpu_halted(CPUState *env) {
if (!env->halted)
return 0;