summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-08-20 11:47:42 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 17:18:03 -0700
commit0fe9a0dc92a64c088e76fcd3d35b2ba36b4d7f3c (patch)
tree521b1fd7d524c1f6bbb3ae94f4bfff4c33c09ed9 /arch/arm64
parent1f96d83b38937294584ede9473c2b2961528f287 (diff)
downloadlinux-3.10-0fe9a0dc92a64c088e76fcd3d35b2ba36b4d7f3c.tar.gz
linux-3.10-0fe9a0dc92a64c088e76fcd3d35b2ba36b4d7f3c.tar.bz2
linux-3.10-0fe9a0dc92a64c088e76fcd3d35b2ba36b4d7f3c.zip
arm64: perf: fix ARMv8 EVTYPE_MASK to include NSH bit
commit 178cd9ce377232518ec17ff2ecab2e80fa60784c upstream. This is a port of f2fe09b055e2 ("ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bit") to arm64, which fixes the broken evtype mask to include the NSH bit, allowing profiling at EL2. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 2a1e9163d67..cea1594ff93 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -784,7 +784,7 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
/*
* PMXEVTYPER: Event selection reg
*/
-#define ARMV8_EVTYPE_MASK 0xc00000ff /* Mask for writable bits */
+#define ARMV8_EVTYPE_MASK 0xc80000ff /* Mask for writable bits */
#define ARMV8_EVTYPE_EVENT 0xff /* Mask for EVENT bits */
/*