diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-23 18:38:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-23 18:38:17 -0400 |
| commit | 901e7e34f83fc8fb4ce82cb29e5b500b7559cd86 (patch) | |
| tree | e3d42fb45f005560a43f195177a98e752ac4737a /arch/arm/Kconfig | |
| parent | 8754c4bf2ac1a64d5c1409a0ae98e21a8f3541c5 (diff) | |
| parent | 2dfcb802d6bd54a2353678c6434846d94b058f2c (diff) | |
Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 22efc5d9c952..3917dd4f270c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -51,6 +51,8 @@ config ARM | |||
| 51 | select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND | 51 | select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND |
| 52 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) | 52 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) |
| 53 | select HAVE_PERF_EVENTS | 53 | select HAVE_PERF_EVENTS |
| 54 | select HAVE_PERF_REGS | ||
| 55 | select HAVE_PERF_USER_STACK_DUMP | ||
| 54 | select HAVE_REGS_AND_STACK_ACCESS_API | 56 | select HAVE_REGS_AND_STACK_ACCESS_API |
| 55 | select HAVE_SYSCALL_TRACEPOINTS | 57 | select HAVE_SYSCALL_TRACEPOINTS |
| 56 | select HAVE_UID16 | 58 | select HAVE_UID16 |