diff options
| author | malc <av1474@comtv.ru> | 2011-08-08 13:37:44 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-08-08 13:37:44 +0400 |
| commit | 9f058c19fcf53c77af15894937ccb380381649c3 (patch) | |
| tree | 7a48577ab755f7221bcd696a68f35616cd1fa296 /target-cris/cpu.h | |
| parent | a67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (diff) | |
| parent | 23ddf2bb1e4bfe2b72a726fe5e828807b65941ad (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'target-cris/cpu.h')
| -rw-r--r-- | target-cris/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h index ecb0df1d33..8ae0ce3ef3 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -226,7 +226,7 @@ static inline int cpu_mmu_index (CPUState *env) } int cpu_cris_handle_mmu_fault(CPUState *env, target_ulong address, int rw, - int mmu_idx, int is_softmmu); + int mmu_idx); #define cpu_handle_mmu_fault cpu_cris_handle_mmu_fault #if defined(CONFIG_USER_ONLY) |