[commits] r7325 - in /fsf/trunk/libc: ChangeLog include/features.h sysdeps/unix/sysv/linux/bits/sched.h version.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Nov 14 00:03:13 2008
New Revision: 7325

Log:
Import glibc-mainline for 2008-11-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/include/features.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h
    fsf/trunk/libc/version.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Nov 14 00:03:13 2008
@@ -1,3 +1,13 @@
+2008-11-13  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* version.h: Bump for 2.9 release.
+	* include/features.h (__GLIBC_MINOR__): Bump to 9.
+
+	[BZ #7029]
+	* sysdeps/unix/sysv/linux/bits/sched.h (__CPU_ALLOC_SIZE):
+	Multiply with sizeof of __cpu_mask, not 8 unconditionally after
+	all the rounding.
+
 2008-11-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #7009]

Modified: fsf/trunk/libc/include/features.h
==============================================================================
--- fsf/trunk/libc/include/features.h (original)
+++ fsf/trunk/libc/include/features.h Fri Nov 14 00:03:13 2008
@@ -311,7 +311,7 @@
 /* Major and minor version number of the GNU C library package.  Use
    these macros to test for features in specific releases.  */
 #define	__GLIBC__	2
-#define	__GLIBC_MINOR__	8
+#define	__GLIBC_MINOR__	9
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sched.h Fri Nov 14 00:03:13 2008
@@ -1,6 +1,6 @@
 /* Definitions of constants and data structure for POSIX 1003.1b-1993
    scheduling interface.
-   Copyright (C) 1996-1999,2001-2003,2005,2006,2007
+   Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -184,7 +184,7 @@
       __dest; }))
 
 # define __CPU_ALLOC_SIZE(count) \
-  ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
+  ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
 # define __CPU_ALLOC(count) __sched_cpualloc (count)
 # define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
 

Modified: fsf/trunk/libc/version.h
==============================================================================
--- fsf/trunk/libc/version.h (original)
+++ fsf/trunk/libc/version.h Fri Nov 14 00:03:13 2008
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.8.90"
+#define RELEASE "stable"
+#define VERSION "2.9"