---

yaml --- r: 97296 b: refs/heads/master c: 74dc51a h: refs/heads/master v: v3
git-mirror · May 23, 2008 · 6e30d80 · 6e30d80
1 parent 2a97e5c
commit 6e30d80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ccc906c97e34fd91dc6aaf5b69b52d824386910
+refs/heads/master: 74dc51a3de06aa516e3b9fdc4017b2aeb38bf44b
diff --git a/trunk/arch/x86/kernel/tsc_32.c b/trunk/arch/x86/kernel/tsc_32.c
@@ -413,6 +413,11 @@ void __init tsc_init(void)
 
 	if (!cpu_khz) {
 		mark_tsc_unstable("could not calculate TSC khz");
+		/*
+		 * We need to disable the TSC completely in this case
+		 * to prevent sched_clock() from using it.
+		 */
+		tsc_disabled = 1;
 		return;
 	}