diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-05 12:21:10 -0700 |
| commit | 4ce7ea0bfbb301ffb79154b6cecd2ef030db4cdf (patch) | |
| tree | a7ad87580793912a9da208e7a9ea21d6c7768f08 /init | |
| parent | 4450182f400f1a5f50b1680faec25af2315c2849 (diff) | |
| parent | 7c4bc9c2662c6d9840afed0e29eb01314af9bb78 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38
Conflicts:
arch/arm/kernel/signal.c
drivers/mmc/card/block.c
drivers/mtd/nand/Kconfig
include/linux/amba/mmci.h
kernel/printk.c
mm/shmem.c
net/socket.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index ce8838396fd..f8f1b3982f4 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -797,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 @@ -1278,8 +1313,18 @@ config PROFILING config TRACEPOINTS bool +config MARKERS + bool "Activate markers" + select TRACEPOINTS + help + Place an empty function call at each marker site. Can be + dynamically changed for a probe function. + source "arch/Kconfig" +config HAVE_LTT_DUMP_TABLES + def_bool n + endmenu # General setup config HAVE_GENERIC_DMA_COHERENT |