Last change caused infinite loops because of missing loop increment.

diff --git a/ChangeLog b/ChangeLog
index 8e59560..7c53795 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;