---

yaml --- r: 191056 b: refs/heads/master c: 3adaebd h: refs/heads/master v: v3
git-mirror · Mar 10, 2010 · 4fe4bce · 4fe4bce
1 parent 6a4f288
commit 4fe4bce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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) {