Merge tag 'arc-fixes-for-3.12-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

torvalds · torvalds · commit ccaa8be8868b · 2013-10-12T10:34:14.000-07:00
Pull ARC fix from Vineet Gupta:
 "Fix for broken gdb 'jump'"

* tag 'arc-fixes-for-3.12-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: Ignore ptrace SETREGSET request for synthetic register "stop_pc"
diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c
@@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target,
 	REG_IGNORE_ONE(pad2);
 	REG_IN_CHUNK(callee, efa, cregs);	/* callee_regs[r25..r13] */
 	REG_IGNORE_ONE(efa);			/* efa update invalid */
-	REG_IN_ONE(stop_pc, &ptregs->ret);	/* stop_pc: PC update */
+	REG_IGNORE_ONE(stop_pc);			/* PC updated via @ret */
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target,`
`102`	`102`	`REG_IGNORE_ONE(pad2);`
`103`	`103`	`REG_IN_CHUNK(callee, efa, cregs); /* callee_regs[r25..r13] */`
`104`	`104`	`REG_IGNORE_ONE(efa); /* efa update invalid */`
`105`		`- REG_IN_ONE(stop_pc, &ptregs->ret); /* stop_pc: PC update */`
	`105`	`+ REG_IGNORE_ONE(stop_pc); /* PC updated via @ret */`
`106`	`106`
`107`	`107`	`return ret;`
`108`	`108`	`}`