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

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

ptrace: cleanup arch_ptrace() on MIPS 



Use new 'addrp', 'datavp' and 'datalp' variables in order to remove
unnecessary castings.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cfd866f6

arch/mips/kernel/ptrace.c

+11 −11
Original line number Diff line number Diff line
@@ -259,6 +259,9 @@ long arch_ptrace(struct task_struct *child, long request, 
		 unsigned long addr, unsigned long data)

{

	int ret;

	void __user *addrp = (void __user *) addr;

	void __user *datavp = (void __user *) data;

	unsigned long __user *datalp = (void __user *) data;



	switch (request) {

	/* when I and D space are separate, these will need to be fixed. */
@@ -387,7 +390,7 @@ long arch_ptrace(struct task_struct *child, long request, 
			ret = -EIO;

			goto out;

		}

		ret = put_user(tmp, (unsigned long __user *) data);

		ret = put_user(tmp, datalp);

		break;

	}
@@ -479,34 +482,31 @@ long arch_ptrace(struct task_struct *child, long request, 
		}



	case PTRACE_GETREGS:

		ret = ptrace_getregs(child, (__s64 __user *) data);

		ret = ptrace_getregs(child, datavp);

		break;



	case PTRACE_SETREGS:

		ret = ptrace_setregs(child, (__s64 __user *) data);

		ret = ptrace_setregs(child, datavp);

		break;



	case PTRACE_GETFPREGS:

		ret = ptrace_getfpregs(child, (__u32 __user *) data);

		ret = ptrace_getfpregs(child, datavp);

		break;



	case PTRACE_SETFPREGS:

		ret = ptrace_setfpregs(child, (__u32 __user *) data);

		ret = ptrace_setfpregs(child, datavp);

		break;



	case PTRACE_GET_THREAD_AREA:

		ret = put_user(task_thread_info(child)->tp_value,

				(unsigned long __user *) data);

		ret = put_user(task_thread_info(child)->tp_value, datalp);

		break;



	case PTRACE_GET_WATCH_REGS:

		ret = ptrace_get_watch_regs(child,

					(struct pt_watch_regs __user *) addr);

		ret = ptrace_get_watch_regs(child, addrp);

		break;



	case PTRACE_SET_WATCH_REGS:

		ret = ptrace_set_watch_regs(child,

					(struct pt_watch_regs __user *) addr);

		ret = ptrace_set_watch_regs(child, addrp);

		break;



	default: