This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch, release/2.11/master, updated. glibc-2.11.2-59-gd795f23

From: pasky at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 30 Nov 2010 02:24:11 -0000
Subject: GNU C Library master sources branch, release/2.11/master, updated. glibc-2.11.2-59-gd795f23
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, release/2.11/master has been updated
       via  d795f23c92bda75cf04b56f42532afeee9209d1b (commit)
       via  42c95109b2e56489a19c64910bd6127a11e2279b (commit)
       via  1e0bcc2ee3019028aa39dd710e32dd8158395328 (commit)
       via  7112fd02abb494e353f5dc5a5057183ae153869e (commit)
      from  dd2fde461e300fc08fa95cff78dae4a76b3e7f8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d795f23c92bda75cf04b56f42532afeee9209d1b

commit d795f23c92bda75cf04b56f42532afeee9209d1b
Author: Petr Baudis <pasky@suse.cz>
Date:   Tue Nov 30 03:21:52 2010 +0100

    Allow arbitrary whitespace in INSTALL (autogenerated by makeinfo)

diff --git a/.gitattributes b/.gitattributes
index 8947e72..ed3e49b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 timezone/* -whitespace
+INSTALL -whitespace

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=42c95109b2e56489a19c64910bd6127a11e2279b

commit 42c95109b2e56489a19c64910bd6127a11e2279b
Author: Andreas Schwab <schwab@redhat.com>
Date:   Mon Sep 27 22:34:21 2010 -0400

    Properly convert f_fsid in statvfs
    (cherry picked from commit c21cc9bcb38a87ff638d1099ca871d94a2192b31)

diff --git a/ChangeLog b/ChangeLog
index 8fba8a6..24259f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-27  Andreas Schwab  <schwab@redhat.com>
+
+	[BZ #11611]
+	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
+	Mask out sign-bit copies when constructing f_fsid.
+
 2010-11-19  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/i386/bits/mman.h: Define MAP_HUGETLB.
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 28c1cb6..6066c86 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -214,7 +214,8 @@ INTERNAL_STATVFS (const char *name, struct STATVFS *buf,
   buf->f_files = fsbuf->f_files;
   buf->f_ffree = fsbuf->f_ffree;
   if (sizeof (buf->f_fsid) == sizeof (fsbuf->f_fsid))
-    buf->f_fsid = (fsbuf->f_fsid.__val[0]
+    buf->f_fsid = ((fsbuf->f_fsid.__val[0]
+		    & ((1UL << (8 * sizeof (fsbuf->f_fsid.__val[0]))) - 1))
 		   | ((unsigned long int) fsbuf->f_fsid.__val[1]
 		      << (8 * (sizeof (buf->f_fsid)
 			       - sizeof (fsbuf->f_fsid.__val[0])))));

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1e0bcc2ee3019028aa39dd710e32dd8158395328

commit 1e0bcc2ee3019028aa39dd710e32dd8158395328
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Fri Nov 19 09:35:39 2010 -0500

    Define MAP_HUGETLB.
    (cherry picked from commit cf7c9078a5acdbb435498ace92cd81009637a971)

diff --git a/ChangeLog b/ChangeLog
index 7cffa7b..8fba8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-19  Ulrich Drepper  <drepper@gmail.com>
+
+	* sysdeps/unix/sysv/linux/i386/bits/mman.h: Define MAP_HUGETLB.
+	* sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Likewise.
+
 2010-11-16  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
diff --git a/sysdeps/unix/sysv/linux/i386/bits/mman.h b/sysdeps/unix/sysv/linux/i386/bits/mman.h
index 22aa401..7ac1aff 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/mman.h
@@ -1,5 +1,6 @@
 /* Definitions for POSIX memory map interface.  Linux/i386 version.
-   Copyright (C) 1997,2000,2003,2005,2006,2009 Free Software Foundation, Inc.
+   Copyright (C) 1997,2000,2003,2005,2006,2009,2010
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -64,6 +65,7 @@
 # define MAP_POPULATE	0x08000		/* Populate (prefault) pagetables.  */
 # define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
 # define MAP_STACK	0x20000		/* Allocation is for a stack.  */
+# define MAP_HUGETLB	0x40000		/* Create huge page mapping.  */
 #endif
 
 /* Flags to `msync'.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
index 3dcbf9c..6f3ad0d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for POSIX memory map interface.  Linux/x86_64 version.
-   Copyright (C) 2001, 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2001,2003,2005,2006,2009,2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -65,6 +65,7 @@
 # define MAP_POPULATE	0x08000		/* Populate (prefault) pagetables.  */
 # define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
 # define MAP_STACK	0x20000		/* Allocation is for a stack.  */
+# define MAP_HUGETLB	0x40000		/* Create huge page mapping.  */
 #endif
 
 /* Flags to `msync'.  */

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7112fd02abb494e353f5dc5a5057183ae153869e

commit 7112fd02abb494e353f5dc5a5057183ae153869e
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Tue Nov 16 12:17:04 2010 -0500

    Define SWAP_FLAG_DISCARD.
    (cherry picked from commit a1fb5e3ebe9d38b5ae6c5bfbfaa04882d52355bc)

diff --git a/ChangeLog b/ChangeLog
index 1ef9fd5..7cffa7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-16  Ulrich Drepper  <drepper@gmail.com>
+
+	* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
+
 2010-11-11  Andreas Schwab  <schwab@redhat.com>
 
 	* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
diff --git a/sysdeps/unix/sysv/linux/sys/swap.h b/sysdeps/unix/sysv/linux/sys/swap.h
index b6e7bef..961006c 100644
--- a/sysdeps/unix/sysv/linux/sys/swap.h
+++ b/sysdeps/unix/sysv/linux/sys/swap.h
@@ -1,5 +1,5 @@
 /* Calls to enable and disable swapping on specified locations.  Linux version.
-   Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 1999, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,6 +28,7 @@
 #define	SWAP_FLAG_PREFER	0x8000	/* Set if swap priority is specified. */
 #define	SWAP_FLAG_PRIO_MASK	0x7fff
 #define	SWAP_FLAG_PRIO_SHIFT	0
+#define SWAP_FLAG_DISCARD	0x10000	/* Discard swap cluster after use.  */
 
 __BEGIN_DECLS
 

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes                             |    1 +
 ChangeLog                                  |   15 +++++++++++++++
 sysdeps/unix/sysv/linux/i386/bits/mman.h   |    4 +++-
 sysdeps/unix/sysv/linux/internal_statvfs.c |    3 ++-
 sysdeps/unix/sysv/linux/sys/swap.h         |    3 ++-
 sysdeps/unix/sysv/linux/x86_64/bits/mman.h |    3 ++-
 6 files changed, 25 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]