OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/x86_64/pthreaddef.h (ARCH_RETRY_MMAP): Take additional 

parameter.  Passed it as permission to mmap.
	* allocatestack.c (allocate_stack): Pass prot as second parameter
	to ARCH_RETRY_MMAP.
This commit is contained in:
Ulrich Drepper 2007-12-14 16:33:44 +00:00
parent bc3e1c1273
commit b8cca206e2
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nptl/ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-14 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/pthreaddef.h (ARCH_RETRY_MMAP): Take additional
parameter. Passed it as permission to mmap.
* allocatestack.c (allocate_stack): Pass prot as second parameter
to ARCH_RETRY_MMAP.
2007-12-12 Ulrich Drepper <drepper@redhat.com>
* tst-basic7.c: Allocate memory for the stack.

2
nptl/allocatestack.c
View File

@ -459,7 +459,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
if (__builtin_expect (mem == MAP_FAILED, 0))
{
#ifdef ARCH_RETRY_MMAP
mem = ARCH_RETRY_MMAP (size);
mem = ARCH_RETRY_MMAP (size, prot);
if (__builtin_expect (mem == MAP_FAILED, 0))
#endif
{

7
nptl/sysdeps/x86_64/pthreaddef.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -42,9 +42,8 @@
/* If it is not possible to allocate memory there retry without that
flag. */
#define ARCH_RETRY_MMAP(size) \
mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, \
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)
#define ARCH_RETRY_MMAP(size, prot) \
mmap (NULL, size, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)
/* XXX Until we have a better place keep the definitions here. */