Commit 84a031c68fd657f2973e7c2ce0207588c66fbd58
1 parent
e7786f27
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
Showing
2 changed files
with
2 additions
and
3 deletions
target-arm/cpu.h
| @@ -217,6 +217,8 @@ uint32_t do_arm_semihosting(CPUARMState *env); | @@ -217,6 +217,8 @@ uint32_t do_arm_semihosting(CPUARMState *env); | ||
| 217 | is returned if the signal was handled by the virtual CPU. */ | 217 | is returned if the signal was handled by the virtual CPU. */ |
| 218 | int cpu_arm_signal_handler(int host_signum, void *pinfo, | 218 | int cpu_arm_signal_handler(int host_signum, void *pinfo, |
| 219 | void *puc); | 219 | void *puc); |
| 220 | +int cpu_arm_handle_mmu_fault (CPUARMState *env, target_ulong address, int rw, | ||
| 221 | + int mmu_idx, int is_softmuu); | ||
| 220 | 222 | ||
| 221 | void cpu_lock(void); | 223 | void cpu_lock(void); |
| 222 | void cpu_unlock(void); | 224 | void cpu_unlock(void); |
target-arm/exec.h
| @@ -37,9 +37,6 @@ static inline void regs_to_env(void) | @@ -37,9 +37,6 @@ static inline void regs_to_env(void) | ||
| 37 | { | 37 | { |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | -int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
| 41 | - int mmu_idx, int is_softmmu); | ||
| 42 | - | ||
| 43 | static inline int cpu_halted(CPUState *env) { | 40 | static inline int cpu_halted(CPUState *env) { |
| 44 | if (!env->halted) | 41 | if (!env->halted) |
| 45 | return 0; | 42 | return 0; |