---

yaml --- r: 305923 b: refs/heads/master c: 6a32847 h: refs/heads/master i: 305921: 50a0d1d 305919: e19180d v: v3
git-mirror · May 22, 2012 · 13f754b · 13f754b
1 parent 1fde51e
commit 13f754b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ea7daa5d7fde47cd41f4d56c2deb949114da9d6
+refs/heads/master: 6a328475cccacb99a13b06978091da936dd51d89
diff --git a/trunk/crypto/xor.c b/trunk/crypto/xor.c
@@ -63,7 +63,7 @@ static void
 do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
 {
 	int speed;
-	unsigned long now;
+	unsigned long now, j;
 	int i, count, max;
 
 	tmpl->next = template_list;
@@ -76,9 +76,11 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
 	 */
 	max = 0;
 	for (i = 0; i < 5; i++) {
-		now = jiffies;
+		j = jiffies;
 		count = 0;
-		while (jiffies == now) {
+		while ((now = jiffies) == j)
+			cpu_relax();
+		while (time_before(jiffies, now + 1)) {
 			mb(); /* prevent loop optimzation */
 			tmpl->do_2(BENCH_SIZE, b1, b2);
 			mb();