---

yaml --- r: 360882 b: refs/heads/master c: f2fe09b h: refs/heads/master v: v3
git-mirror · Mar 3, 2013 · f37f5ad · f37f5ad
1 parent fb9b465
commit f37f5ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a8e611874da714ee7ef1e92e5160b38dc54959b
+refs/heads/master: f2fe09b055e2549de41fb107b34c60bac4a1b0cf
diff --git a/trunk/arch/arm/kernel/perf_event_v7.c b/trunk/arch/arm/kernel/perf_event_v7.c
@@ -774,7 +774,7 @@ static const unsigned armv7_a7_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
 /*
  * PMXEVTYPER: Event selection reg
  */
-#define	ARMV7_EVTYPE_MASK	0xc00000ff	/* Mask for writable bits */
+#define	ARMV7_EVTYPE_MASK	0xc80000ff	/* Mask for writable bits */
 #define	ARMV7_EVTYPE_EVENT	0xff		/* Mask for EVENT bits */
 
 /*