From 4fe4bce5f3e46e13288663056d8e717de9ac4fc6 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 5 Mar 2010 12:09:29 +0100
Subject: [PATCH] --- yaml --- r: 191056 b: refs/heads/master c:
 3adaebd69557615c1bf0365ce5e32d93ac7d82af h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ed6ad8d28b50..add591fc375a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30a813ae035d3e220a89609adce878e045c49547
+refs/heads/master: 3adaebd69557615c1bf0365ce5e32d93ac7d82af
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 72453ac5fb7d..a67fff14475e 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -127,10 +127,8 @@ static int reserve_ds_buffers(void)
 
 		err = -ENOMEM;
 		ds = kzalloc(sizeof(*ds), GFP_KERNEL);
-		if (unlikely(!ds)) {
-			kfree(buffer);
+		if (unlikely(!ds))
 			break;
-		}
 		per_cpu(cpu_hw_events, cpu).ds = ds;
 
 		if (x86_pmu.bts) {