From: Ulrich Drepper <drepper@gmail.com>
Date: Tue, 22 Mar 2011 05:52:43 +0000 (-0400)
Subject: Last change caused infinite loops because of missing loop increment.
X-Git-Tag: glibc-2.14~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2420590cb2d7d3e580708d21e875d6562ae3c9;p=thirdparty%2Fglibc.git

Last change caused infinite loops because of missing loop increment.
---

diff --git a/ChangeLog b/ChangeLog
index 8e595604325..7c537958cdd 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 4ea1a2bf580..1f5d3b06b15 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 fdd6427e12e..bd4be3d2df5 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;