bsd-user: align use of mmap_lock to that of linux-user
The introduction of stricter mmap_lock checking in translate-all broke the BSD user build. The working mmap_lock functions were hidden behind CONFIG_USE_NPTL which is never defined. This patch brings them inline with linux-user. Despite the disapearence of the comment "We aren't threadsafe to start with..." this doesn't make bsd-user so. It will still need the rest of the fixes that have been done in linux-user ported over. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
02bed6bd5f
commit
95992b674c
|
@ -24,8 +24,7 @@
|
||||||
|
|
||||||
//#define DEBUG_MMAP
|
//#define DEBUG_MMAP
|
||||||
|
|
||||||
#if defined(CONFIG_USE_NPTL)
|
static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||||
pthread_mutex_t mmap_mutex;
|
|
||||||
static int __thread mmap_lock_count;
|
static int __thread mmap_lock_count;
|
||||||
|
|
||||||
void mmap_lock(void)
|
void mmap_lock(void)
|
||||||
|
@ -62,16 +61,6 @@ void mmap_fork_end(int child)
|
||||||
else
|
else
|
||||||
pthread_mutex_unlock(&mmap_mutex);
|
pthread_mutex_unlock(&mmap_mutex);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
/* We aren't threadsafe to start with, so no need to worry about locking. */
|
|
||||||
void mmap_lock(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmap_unlock(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* NOTE: all the constants are the HOST ones, but addresses are target. */
|
/* NOTE: all the constants are the HOST ones, but addresses are target. */
|
||||||
int target_mprotect(abi_ulong start, abi_ulong len, int prot)
|
int target_mprotect(abi_ulong start, abi_ulong len, int prot)
|
||||||
|
|
|
@ -209,10 +209,8 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
|
||||||
abi_ulong new_addr);
|
abi_ulong new_addr);
|
||||||
int target_msync(abi_ulong start, abi_ulong len, int flags);
|
int target_msync(abi_ulong start, abi_ulong len, int flags);
|
||||||
extern unsigned long last_brk;
|
extern unsigned long last_brk;
|
||||||
#if defined(CONFIG_USE_NPTL)
|
|
||||||
void mmap_fork_start(void);
|
void mmap_fork_start(void);
|
||||||
void mmap_fork_end(int child);
|
void mmap_fork_end(int child);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* main.c */
|
/* main.c */
|
||||||
extern unsigned long x86_stack_size;
|
extern unsigned long x86_stack_size;
|
||||||
|
|
Loading…
Reference in New Issue