From: Sergey Fedorov <serge.f...@gmail.com> Signed-off-by: Sergey Fedorov <serge.f...@gmail.com> Signed-off-by: Sergey Fedorov <sergey.fedo...@linaro.org> --- bsd-user/mmap.c | 7 +++++++ include/exec/exec-all.h | 2 ++ linux-user/mmap.c | 7 +++++++ 3 files changed, 16 insertions(+)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 610f91b28584..b2e5909b03c4 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -42,6 +42,13 @@ void mmap_unlock(void) } } +void mmap_lock_reset(void) +{ + if (mmap_lock_count) { + pthread_mutex_unlock(&mmap_mutex); + } +} + /* Grab lock to make sure things are in a consistent state after fork(). */ void mmap_fork_start(void) { diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index c1f59fa59d2c..0375acb5ab40 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -369,6 +369,7 @@ void tlb_fill(CPUState *cpu, target_ulong addr, int is_write, int mmu_idx, #if defined(CONFIG_USER_ONLY) void mmap_lock(void); void mmap_unlock(void); +void mmap_lock_reset(void); static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) { @@ -377,6 +378,7 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong #else static inline void mmap_lock(void) {} static inline void mmap_unlock(void) {} +static inline void mmap_lock_reset(void) {} /* cputlb.c */ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr); diff --git a/linux-user/mmap.c b/linux-user/mmap.c index c4371d943a85..4cd998f96766 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -43,6 +43,13 @@ void mmap_unlock(void) } } +void mmap_lock_reset(void) +{ + if (mmap_lock_count) { + pthread_mutex_unlock(&mmap_mutex); + } +} + /* Grab lock to make sure things are in a consistent state after fork(). */ void mmap_fork_start(void) { -- 1.9.1