Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeebd3a3 authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds
Browse files

ptrace: cleanup arch_ptrace() and friends on Blackfin 



Change signature of get/put_reg() according to the change of arch_ptrace()
and remove unnecessary castings.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f29b8fb

arch/blackfin/kernel/ptrace.c

+7 −6
Original line number Diff line number Diff line
@@ -38,12 +38,13 @@ 
 * Get contents of register REGNO in task TASK.

 */

static inline long

get_reg(struct task_struct *task, long regno, unsigned long __user *datap)

get_reg(struct task_struct *task, unsigned long regno,

	unsigned long __user *datap)

{

	long tmp;

	struct pt_regs *regs = task_pt_regs(task);



	if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0)

	if (regno & 3 || regno > PT_LAST_PSEUDO)

		return -EIO;



	switch (regno) {
@@ -74,11 +75,11 @@ get_reg(struct task_struct *task, long regno, unsigned long __user *datap) 
 * Write contents of register REGNO in task TASK.

 */

static inline int

put_reg(struct task_struct *task, long regno, unsigned long data)

put_reg(struct task_struct *task, unsigned long regno, unsigned long data)

{

	struct pt_regs *regs = task_pt_regs(task);



	if (regno & 3 || regno > PT_LAST_PSEUDO || regno < 0)

	if (regno & 3 || regno > PT_LAST_PSEUDO)

		return -EIO;



	switch (regno) {
@@ -369,14 +370,14 @@ long arch_ptrace(struct task_struct *child, long request, 
		return copy_regset_to_user(child, &user_bfin_native_view,

					   REGSET_GENERAL,

					   0, sizeof(struct pt_regs),

					   (void __user *)data);

					   datap);



	case PTRACE_SETREGS:

		pr_debug("ptrace: PTRACE_SETREGS\n");

		return copy_regset_from_user(child, &user_bfin_native_view,

					     REGSET_GENERAL,

					     0, sizeof(struct pt_regs),

					     (const void __user *)data);

					     datap);



	case_default:

	default: