---

yaml --- r: 304829 b: refs/heads/master c: 10c2502 h: refs/heads/master i: 304827: 9dc07c0 v: v3
git-mirror · Apr 26, 2012 · 5363cdb · 5363cdb
1 parent 9905bff
commit 5363cdb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dbe927b1eddcbd66da1653168e33122aca84f4e
+refs/heads/master: 10c250234c98928d1e15c4cea1c44b9a25354ccf
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -484,9 +484,6 @@ static int __x86_pmu_event_init(struct perf_event *event)
 
 	/* mark unused */
 	event->hw.extra_reg.idx = EXTRA_REG_NONE;
-
-	/* mark not used */
-	event->hw.extra_reg.idx = EXTRA_REG_NONE;
 	event->hw.branch_reg.idx = EXTRA_REG_NONE;
 
 	return x86_pmu.hw_config(event);