merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 3 Jun 2010 21:39:20 +0000 (14:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 3 Jun 2010 21:39:20 +0000 (14:39 -0700)
Change-Id: Ib7fc9c6f79f9b13e2175da137005d8968ea85eaf

1  2 
libc/bionic/pthread.c
libc/include/pthread.h

index ae44b067a97245575d004c49d6d72e45311dad9c,666a6b8e3788f2dd2b3dfeb98f52cefc9458d88c..e17e3664785db24203151e03b61bfdb1ffbfa354
  #include <memory.h>
  #include <assert.h>
  #include <malloc.h>
 +#include <linux/futex.h>
+ #include <sys/prctl.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
  
  extern int  __pthread_clone(int (*fn)(void*), void *child_stack, int flags, void *arg);
  extern void _exit_with_stack_teardown(void * stackBase, int stackSize, int retCode);
Simple merge