[commits] r13232 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/i386/sysconf.c sysdeps/x86_64/cacheinfo.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Mar 22 00:03:49 2011
New Revision: 13232

Log:
Import glibc-mainline for 2011-03-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/sysconf.c
    fsf/trunk/libc/sysdeps/x86_64/cacheinfo.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Mar 22 00:03:49 2011
@@ -1,3 +1,9 @@
+2011-03-22  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
+	round counter.
+	* sysdeps/x86_64/cacheinfo.c (intel_check_word): Likewise.
+
 2011-03-20  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	[BZ #12597]

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/sysconf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/sysconf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/sysconf.c Tue Mar 22 00:03:49 2011
@@ -231,6 +231,8 @@
 		  assert (offset == 2);
 		  return (ebx & 0xfff) + 1;
 		}
+
+	      ++round;
 	    }
 	  /* There is no other cache information anywhere else.  */
 	  break;

Modified: fsf/trunk/libc/sysdeps/x86_64/cacheinfo.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/cacheinfo.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/cacheinfo.c Tue Mar 22 00:03:49 2011
@@ -226,6 +226,8 @@
 		  assert (offset == 2);
 		  return (ebx & 0xfff) + 1;
 		}
+
+	      ++round;
 	    }
 	  /* There is no other cache information anywhere else.  */
 	  break;