From 36b67e37eec195fbdf43b37bb33bf4cdfb7f9f7e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jun 2011 16:35:37 +0900
Subject: [PATCH] --- yaml --- r: 252956 b: refs/heads/master c:
 5c6cce92bc8aee751aafe82c5d9caf7553226a3d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/misc/kgdbts.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1825c3ff9f6c..2173ad47c33e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5b2c5b2ad5853591a6cac6134cd0f599a720865
+refs/heads/master: 5c6cce92bc8aee751aafe82c5d9caf7553226a3d
diff --git a/trunk/drivers/misc/kgdbts.c b/trunk/drivers/misc/kgdbts.c
index b0c56313dbbb..8cebec5e85ee 100644
--- a/trunk/drivers/misc/kgdbts.c
+++ b/trunk/drivers/misc/kgdbts.c
@@ -304,7 +304,10 @@ static int check_and_rewind_pc(char *put_str, char *arg)
 		return 1;
 	}
 	/* Readjust the instruction pointer if needed */
-	instruction_pointer_set(&kgdbts_regs, ip + offset);
+	ip += offset;
+#ifdef GDB_ADJUSTS_BREAK_OFFSET
+	instruction_pointer_set(&kgdbts_regs, ip);
+#endif
 	return 0;
 }