This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.13-52-gbb24205
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Mar 2011 05:53:25 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-52-gbb24205
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, master has been updated
via bb2420590cb2d7d3e580708d21e875d6562ae3c9 (commit)
from 786e84c533d00573fa0ba7e701b1ecb03f0111fb (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=bb2420590cb2d7d3e580708d21e875d6562ae3c9
commit bb2420590cb2d7d3e580708d21e875d6562ae3c9
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Mar 22 01:52:43 2011 -0400
Last change caused infinite loops because of missing loop increment.
diff --git a/ChangeLog b/ChangeLog
index 8e59560..7c53795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-22 Ulrich Drepper <drepper@gmail.com>
+
+ * 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@intel.com>
[BZ #12597]
diff --git a/sysdeps/unix/sysv/linux/i386/sysconf.c b/sysdeps/unix/sysv/linux/i386/sysconf.c
index 4ea1a2b..1f5d3b0 100644
--- a/sysdeps/unix/sysv/linux/i386/sysconf.c
+++ b/sysdeps/unix/sysv/linux/i386/sysconf.c
@@ -231,6 +231,8 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
assert (offset == 2);
return (ebx & 0xfff) + 1;
}
+
+ ++round;
}
/* There is no other cache information anywhere else. */
break;
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c
index fdd6427..bd4be3d 100644
--- a/sysdeps/x86_64/cacheinfo.c
+++ b/sysdeps/x86_64/cacheinfo.c
@@ -226,6 +226,8 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
assert (offset == 2);
return (ebx & 0xfff) + 1;
}
+
+ ++round;
}
/* There is no other cache information anywhere else. */
break;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/i386/sysconf.c | 2 ++
sysdeps/x86_64/cacheinfo.c | 2 ++
3 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources