From f5068d42336005c3238f03e266588a47af8f451e Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 13 Oct 2005 14:41:44 -0700 Subject: [PATCH] --- yaml --- r: 9861 b: refs/heads/master c: 34cb711ba922f53cca45443b8c3c1078873cf599 h: refs/heads/master i: 9859: caa1dde3f97a992787349de868e3250d4950b90f v: v3 --- [refs] | 2 +- trunk/net/sched/Kconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1664f3b974fd..bdff60fbc2ca 100644 --- 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 index 45d3bc0812c8..81510da31792 100644 --- 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