aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-10-01 17:18:47 -0400
committerIngo Molnar <mingo@elte.hu>2010-10-05 03:48:07 -0400
commitc62f981f9309486ba5546edbb5925f71e441fa65 (patch)
treea552e29d26d470349fe561903a1b33d2669583b7
parent00e8976200665eec2fa9264d61885b4d1384d4f0 (diff)
perf, gcc-4.6: Fix set but unused variable
Just dead code I believe. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: andi@firstfloor.org Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/perf_event.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 6526a86616a7..e2513f26ba8b 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1152,7 +1152,6 @@ static int x86_pmu_handle_irq(struct pt_regs *regs)
1152 struct perf_sample_data data; 1152 struct perf_sample_data data;
1153 struct cpu_hw_events *cpuc; 1153 struct cpu_hw_events *cpuc;
1154 struct perf_event *event; 1154 struct perf_event *event;
1155 struct hw_perf_event *hwc;
1156 int idx, handled = 0; 1155 int idx, handled = 0;
1157 u64 val; 1156 u64 val;
1158 1157
@@ -1173,7 +1172,6 @@ static int x86_pmu_handle_irq(struct pt_regs *regs)
1173 } 1172 }
1174 1173
1175 event = cpuc->events[idx]; 1174 event = cpuc->events[idx];
1176 hwc = &event->hw;
1177 1175
1178 val = x86_perf_event_update(event); 1176 val = x86_perf_event_update(event);
1179 if (val & (1ULL << (x86_pmu.cntval_bits - 1))) 1177 if (val & (1ULL << (x86_pmu.cntval_bits - 1)))