From 5363cdb4ab5adebb2e8dcc3f87bde017bfda27ff Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Thu, 5 Apr 2012 18:24:41 +0200
Subject: [PATCH] --- yaml --- r: 304829 b: refs/heads/master c:
 10c250234c98928d1e15c4cea1c44b9a25354ccf h: refs/heads/master i:   304827:
 9dc07c0e54ef780c3a724c27235f93d664f89831 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2867000857c6..5878e381f7e8 100644
--- 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
index bb8e03407e18..e33e9cf160eb 100644
--- 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);