From 134d9a2f7eba4d364dc093f7bf5c2eee4b99ca70 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Fri, 19 Dec 2008 12:59:28 +0100
Subject: [PATCH] --- yaml --- r: 128209 b: refs/heads/master c:
 8350c78734e67ac1f8bfd4eb14b70ff4d01a9a12 h: refs/heads/master i:   128207:
 765258a5e5bd078cb9676ccfec948bc1e9346bb7 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/oprofile/buffer_sync.c |  2 --
 trunk/drivers/oprofile/cpu_buffer.c  | 10 ++--------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a6efc91e4a6f..2f45a3f556b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4ff2364417f0092e49f6a3aa474549a56697f2d
+refs/heads/master: 8350c78734e67ac1f8bfd4eb14b70ff4d01a9a12
diff --git a/trunk/drivers/oprofile/buffer_sync.c b/trunk/drivers/oprofile/buffer_sync.c
index 7415d2e6b3a1..e61e25fda1ad 100644
--- a/trunk/drivers/oprofile/buffer_sync.c
+++ b/trunk/drivers/oprofile/buffer_sync.c
@@ -557,11 +557,9 @@ void sync_buffer(int cpu)
 				break;
 #ifdef CONFIG_OPROFILE_IBS
 			case IBS_FETCH_BEGIN:
-				state = sb_bt_start;
 				add_ibs_begin(cpu, IBS_FETCH_CODE, mm);
 				break;
 			case IBS_OP_BEGIN:
-				state = sb_bt_start;
 				add_ibs_begin(cpu, IBS_OP_CODE, mm);
 				break;
 #endif
diff --git a/trunk/drivers/oprofile/cpu_buffer.c b/trunk/drivers/oprofile/cpu_buffer.c
index 8ae37c9d0ec4..92bf8c0d86fe 100644
--- a/trunk/drivers/oprofile/cpu_buffer.c
+++ b/trunk/drivers/oprofile/cpu_buffer.c
@@ -347,17 +347,11 @@ void oprofile_add_ibs_sample(struct pt_regs * const regs,
 		fail = fail || add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
 	}
 
-	if (fail)
-		goto fail;
-
-	if (oprofile_backtrace_depth)
-		oprofile_ops.backtrace(regs, oprofile_backtrace_depth);
-
-	return;
+	if (!fail)
+		return;
 
 fail:
 	cpu_buf->sample_lost_overflow++;
-	return;
 }
 
 #endif