diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:54 -0400 |
|---|---|---|
| committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:54 -0400 |
| commit | 553d3e04ba0b6bf34cfa7bd3962e1085d2c0d1d4 (patch) | |
| tree | 7d4984627e2977c68240661e12644ec49a46fa14 /init | |
| parent | 9b7657e28d034747a24ab9744dd5dbba62b0decf (diff) | |
trace-clock-fix-kconfig-apply-problem
trace clock kconfig options were incorrectly in cgroups menu (rebase error)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/init/Kconfig b/init/Kconfig index 074ef0c1d20..64da1a37121 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -683,41 +683,6 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED select this option (if, for some reason, they need to disable it then noswapaccount does the trick). -# -# Architectures with a 64-bits get_cycles() should select this. -# They should also define -# get_cycles_barrier() : instruction synchronization barrier if required -# get_cycles_rate() : cycle counter rate, in HZ. If 0, TSC are not synchronized -# across CPUs or their frequency may vary due to frequency scaling. -# -config HAVE_GET_CYCLES - def_bool n - -# -# Architectures with a specialized tracing clock should select this. -# -config HAVE_TRACE_CLOCK - def_bool n - -config HAVE_TRACE_CLOCK_GENERIC - bool - default y if (!HAVE_TRACE_CLOCK) - default n if HAVE_TRACE_CLOCK - select HAVE_TRACE_CLOCK_32_TO_64 if (!64BIT) - -# -# Architectures with only a 32-bits clock source should select this. -# -config HAVE_TRACE_CLOCK_32_TO_64 - def_bool n - -# -# Architectures which need to dynamically detect if their TSC is unsynchronized -# across cpus should select this. -# -config HAVE_UNSYNCHRONIZED_TSC - def_bool n - menuconfig CGROUP_SCHED bool "Group CPU scheduler" depends on EXPERIMENTAL @@ -832,6 +797,41 @@ config NET_NS endif # NAMESPACES +# +# Architectures with a 64-bits get_cycles() should select this. +# They should also define +# get_cycles_barrier() : instruction synchronization barrier if required +# get_cycles_rate() : cycle counter rate, in HZ. If 0, TSC are not synchronized +# across CPUs or their frequency may vary due to frequency scaling. +# +config HAVE_GET_CYCLES + def_bool n + +# +# Architectures with a specialized tracing clock should select this. +# +config HAVE_TRACE_CLOCK + def_bool n + +config HAVE_TRACE_CLOCK_GENERIC + bool + default y if (!HAVE_TRACE_CLOCK) + default n if HAVE_TRACE_CLOCK + select HAVE_TRACE_CLOCK_32_TO_64 if (!64BIT) + +# +# Architectures with only a 32-bits clock source should select this. +# +config HAVE_TRACE_CLOCK_32_TO_64 + def_bool n + +# +# Architectures which need to dynamically detect if their TSC is unsynchronized +# across cpus should select this. +# +config HAVE_UNSYNCHRONIZED_TSC + def_bool n + config SCHED_AUTOGROUP bool "Automatic process group scheduling" select EVENTFD |