aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
commit59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch)
treeb337d73229a69e399d4e4f7128b33ce734660e35 /net/sched/Kconfig
parent0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff)
parent046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff)
downloadkernel_samsung_smdk4412-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.gz
kernel_samsung_smdk4412-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.bz2
kernel_samsung_smdk4412-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.zip
Merge branch 'master'
Diffstat (limited to 'net/sched/Kconfig')
-rw-r--r--net/sched/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 45d3bc0812c..81510da3179 100644
--- a/net/sched/Kconfig
+++ b/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