Last change caused infinite loops because of missing loop increment.

git-mirror · Mar 22, 2011 · bb24205 · bb24205
1 parent 786e84c
commit bb24205
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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;