[commits] r11631 - in /fsf/trunk/libc: ./ sysdeps/powerpc/powerpc32/ppca2/ sysdeps/powerpc/powerpc64/ppca2/ sysdeps/unix/sysv/linux/ s...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Sep 28 00:03:09 2010
New Revision: 11631

Log:
Import glibc-mainline for 2010-09-28

Removed:
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/ppca2/
    fsf/trunk/libc/sysdeps/powerpc/powerpc64/ppca2/
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/ppca2/
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/ppca2/
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Sep 28 00:03:09 2010
@@ -1,16 +1,13 @@
+2010-09-27  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	[BZ #11611]
+	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
+	Mask out sign-bit copies when constructing f_fsid.
+
 2010-09-24  Petr Baudis <pasky@xxxxxxx>
 
 	* debug/stack_chk_fail_local.c: Add missing licence exception.
 	* debug/warning-nop.c: Likewise.
-
-2010-09-15  Michael B. Brutman  <brutman@xxxxxxxxxx>
-
-	* sysdeps/powerpc/powerpc32/ppca2/memcpy.S: New file.
-	* sysdeps/powerpc/powerpc64/ppca2/memcpy.S: New file.
-	* sysdeps/unix/sysv/linux/powerpc/powerpc32/ppca2/fpu/Implies: New
-	submachine.
-	* sysdeps/unix/sysv/linux/powerpc/powerpc64/ppca2/fpu/Implies:
-	Likewise.
 
 2010-09-15  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c Tue Sep 28 00:03:09 2010
@@ -228,7 +228,8 @@
   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])))));