---

yaml --- r: 9861 b: refs/heads/master c: 34cb711 h: refs/heads/master i: 9859: caa1dde v: v3
git-mirror · Oct 13, 2005 · f5068d4 · f5068d4
1 parent 0e677fb
commit f5068d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8923c6b852d3a97c1faad0566e38fca330375a7
+refs/heads/master: 34cb711ba922f53cca45443b8c3c1078873cf599
diff --git a/trunk/net/sched/Kconfig b/trunk/net/sched/Kconfig
@@ -72,9 +72,11 @@ config NET_SCH_CLK_GETTIMEOFDAY
 	  Choose this if you need a high resolution clock source but can't use
 	  the CPU's cycle counter.
 
+# don't allow on SMP x86 because they can have unsynchronized TSCs.
+# gettimeofday is a good alternative
 config NET_SCH_CLK_CPU
 	bool "CPU cycle counter"
-	depends on X86_TSC || X86_64 || ALPHA || SPARC64 || PPC64 || IA64
+	depends on ((X86_TSC || X86_64) && !SMP) || ALPHA || SPARC64 || PPC64 || IA64
 	help
 	  Say Y here if you want to use the CPU's cycle counter as clock source.
 	  This is a cheap and high resolution clock source, but on some