diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
| commit | 59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch) | |
| tree | b337d73229a69e399d4e4f7128b33ce734660e35 /net/sched | |
| parent | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 45d3bc0812c8..81510da31792 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -72,9 +72,11 @@ config NET_SCH_CLK_GETTIMEOFDAY | |||
| 72 | Choose this if you need a high resolution clock source but can't use | 72 | Choose this if you need a high resolution clock source but can't use |
| 73 | the CPU's cycle counter. | 73 | the CPU's cycle counter. |
| 74 | 74 | ||
| 75 | # don't allow on SMP x86 because they can have unsynchronized TSCs. | ||
| 76 | # gettimeofday is a good alternative | ||
| 75 | config NET_SCH_CLK_CPU | 77 | config NET_SCH_CLK_CPU |
| 76 | bool "CPU cycle counter" | 78 | bool "CPU cycle counter" |
| 77 | depends on X86_TSC || X86_64 || ALPHA || SPARC64 || PPC64 || IA64 | 79 | depends on ((X86_TSC || X86_64) && !SMP) || ALPHA || SPARC64 || PPC64 || IA64 |
| 78 | help | 80 | help |
| 79 | Say Y here if you want to use the CPU's cycle counter as clock source. | 81 | Say Y here if you want to use the CPU's cycle counter as clock source. |
| 80 | This is a cheap and high resolution clock source, but on some | 82 | This is a cheap and high resolution clock source, but on some |