svn commit: branches/uClibc-nptl: include libc/sysdeps/linux/common/bits

[sjhill at uclibc.org]

Author: sjhill
Date: 2007-04-14 10:57:22 -0700 (Sat, 14 Apr 2007)
New Revision: 18443

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/include/sched.h
   branches/uClibc-nptl/libc/sysdeps/linux/common/bits/sched.h


Changeset:
Modified: branches/uClibc-nptl/include/sched.h
===================================================================
--- branches/uClibc-nptl/include/sched.h	2007-04-14 17:34:47 UTC (rev 18442)
+++ branches/uClibc-nptl/include/sched.h	2007-04-14 17:57:22 UTC (rev 18443)
@@ -63,7 +63,7 @@
 extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
 
 
-#if 0 /*def __USE_GNU*/
+#ifdef __USE_GNU
 /* Access macros for `cpu_set'.  */
 #define CPU_SETSIZE __CPU_SETSIZE
 #define CPU_SET(cpu, cpusetp)	__CPU_SET (cpu, cpusetp)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/bits/sched.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/bits/sched.h	2007-04-14 17:34:47 UTC (rev 18442)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/bits/sched.h	2007-04-14 17:57:22 UTC (rev 18443)
@@ -29,7 +29,7 @@
 #define SCHED_OTHER	0
 #define SCHED_FIFO	1
 #define SCHED_RR	2
-#if 0 /*def __USE_GNU*/
+#ifdef __USE_GNU
 # define SCHED_BATCH	3
 #endif
 
@@ -40,7 +40,6 @@
 # define CLONE_FS      0x00000200 /* Set if fs info shared between processes.  */
 # define CLONE_FILES   0x00000400 /* Set if open files shared between processes.  */
 # define CLONE_SIGHAND 0x00000800 /* Set if signal handlers shared.  */
-# define CLONE_PID     0x00001000 /* Set if pid shared.  */
 # define CLONE_PTRACE  0x00002000 /* Set if tracing continues on the child.  */
 # define CLONE_VFORK   0x00004000 /* Set if the parent wants the child to
 				     wake it up on mm_release.  */
@@ -70,11 +69,16 @@
 
 __BEGIN_DECLS
 
+#ifdef __USE_MISC
 /* Clone current process.  */
-#ifdef __USE_MISC
 extern int clone (int (*__fn) (void *__arg), void *__child_stack,
-		  int __flags, void *__arg) __THROW;
+		  int __flags, void *__arg, ...) __THROW;
+
+#if 0
+/* Unshare the specified resources.  */
+extern int unshare (int __flags) __THROW;
 #endif
+#endif
 
 __END_DECLS
 
@@ -91,6 +95,7 @@
 # undef __need_schedparam
 #endif
 
+
 #if defined _SCHED_H && !defined __cpu_set_t_defined
 # define __cpu_set_t_defined
 /* Size definition for CPU sets.  */
@@ -114,8 +119,8 @@
 # define __CPU_ZERO(cpusetp) \
   do {									      \
     unsigned int __i;							      \
-    cpu_set *__arr = (cpusetp);						      \
-    for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i)	      \
+    cpu_set_t *__arr = (cpusetp);					      \
+    for (__i = 0; __i < sizeof (cpu_set_t) / sizeof (__cpu_mask); ++__i)      \
       __arr->__bits[__i] = 0;						      \
   } while (0)
 # define __CPU_SET(cpu, cpusetp) \