---

yaml --- r: 305015 b: refs/heads/master c: 42fa425 h: refs/heads/master i: 305013: b5094f8 305011: 2cf171a 305007: b2eaf47 v: v3
git-mirror · May 7, 2012 · 7c2f489 · 7c2f489
1 parent 5817a2b
commit 7c2f489
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22042c086c1b6814b9f3ecf2720f6280bede9c47
+refs/heads/master: 42fa4250436304d4650fa271f37671f6cee24e08
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
@@ -1325,11 +1325,13 @@ void __cpuinit setup_local_APIC(void)
 			       acked);
 			break;
 		}
-		if (cpu_has_tsc) {
-			rdtscll(ntsc);
-			max_loops = (cpu_khz << 10) - (ntsc - tsc);
-		} else
-			max_loops--;
+		if (queued) {
+			if (cpu_has_tsc) {
+				rdtscll(ntsc);
+				max_loops = (cpu_khz << 10) - (ntsc - tsc);
+			} else
+				max_loops--;
+		}
 	} while (queued && max_loops > 0);
 	WARN_ON(max_loops <= 0);