diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:45:05 -0400 |
| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (patch) | |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c /arch/Kconfig | |
| parent | 12a81c8df13c60904febcafcf6b90ca1acb67122 (diff) | |
| parent | eb703f98191a505f78d0066712ad67d5dedc4c90 (diff) | |
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index acda512da2e2..4877a8c8ee16 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -151,4 +151,11 @@ config HAVE_MIXED_BREAKPOINTS_REGS | |||
| 151 | config HAVE_USER_RETURN_NOTIFIER | 151 | config HAVE_USER_RETURN_NOTIFIER |
| 152 | bool | 152 | bool |
| 153 | 153 | ||
| 154 | config HAVE_PERF_EVENTS_NMI | ||
| 155 | bool | ||
| 156 | help | ||
| 157 | System hardware can generate an NMI using the perf event | ||
| 158 | subsystem. Also has support for calculating CPU cycle events | ||
| 159 | to determine how many clock cycles in a given period. | ||
| 160 | |||
| 154 | source "kernel/gcov/Kconfig" | 161 | source "kernel/gcov/Kconfig" |