kgdbts: only use new asm-generic/ptrace.h api when needed
authorMike Frysinger <vapier@gentoo.org>
Sat, 28 May 2011 14:04:25 +0000 (10:04 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jun 2011 07:35:01 +0000 (16:35 +0900)
The new instruction_pointer_set helper is defined for people who have
converted to asm-generic/ptrace.h, so don't use it generally unless
the arch needs it (in which case it has been converted).  This should
fix building of kgdb tests for arches not yet converted.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/misc/kgdbts.c

index b0c56313dbbb4928826c08f535f3305490c7c61e..8cebec5e85eeb3d3c80bd998815a3e07f1a913ad 100644 (file)
@@ -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;
 }