diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-24 03:12:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-24 03:12:05 -0400 |
| commit | a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f (patch) | |
| tree | 452cb8addc26f5c79fdd4e2fea92c78dc17fc8e8 /arch/Kconfig | |
| parent | d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (diff) | |
| parent | 46eb3b64dddd20f44e76b08676fa642dd374bf1d (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index fe48fc7a3eba..53d7f619a1b9 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI | |||
| 158 | subsystem. Also has support for calculating CPU cycle events | 158 | subsystem. Also has support for calculating CPU cycle events |
| 159 | to determine how many clock cycles in a given period. | 159 | to determine how many clock cycles in a given period. |
| 160 | 160 | ||
| 161 | config HAVE_ARCH_JUMP_LABEL | ||
| 162 | bool | ||
| 163 | |||
| 161 | source "kernel/gcov/Kconfig" | 164 | source "kernel/gcov/Kconfig" |