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

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

ptrace: change signature of arch_ptrace() 



Fix up the arguments to arch_ptrace() to take account of the fact that
@addr and @data are now unsigned long rather than long as of a preceding
patch in this series.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9fed81dc

arch/alpha/kernel/ptrace.c

+4 −3
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ void ptrace_disable(struct task_struct *child) 
	user_disable_single_step(child);

}



long arch_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request,

		 unsigned long addr, unsigned long data)

{

	unsigned long tmp;

	size_t copied;
@@ -292,7 +293,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	case PTRACE_PEEKUSR:

		force_successful_syscall_return();

		ret = get_reg(child, addr);

		DBG(DBG_MEM, ("peek $%ld->%#lx\n", addr, ret));

		DBG(DBG_MEM, ("peek $%lu->%#lx\n", addr, ret));

		break;



	/* When I and D space are separate, this will have to be fixed.  */
@@ -302,7 +303,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		break;



	case PTRACE_POKEUSR: /* write the specified register */

		DBG(DBG_MEM, ("poke $%ld<-%#lx\n", addr, data));

		DBG(DBG_MEM, ("poke $%lu<-%#lx\n", addr, data));

		ret = put_reg(child, addr, data);

		break;

	default:

arch/arm/kernel/ptrace.c

+2 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,8 @@ out: 
}

#endif



long arch_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request,

		 unsigned long addr, unsigned long data)

{

	int ret;

arch/avr32/kernel/ptrace.c

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs) 
	return ret;

}



long arch_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request,

		 unsigned long addr, unsigned long data)

{

	int ret;

arch/blackfin/kernel/ptrace.c

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ void user_disable_single_step(struct task_struct *child) 
	clear_tsk_thread_flag(child, TIF_SINGLESTEP);

}



long arch_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request,

		 unsigned long addr, unsigned long data)

{

	int ret;

	unsigned long __user *datap = (unsigned long __user *)data;

arch/cris/arch-v10/kernel/ptrace.c

+4 −3
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ ptrace_disable(struct task_struct *child) 
 * (in user space) where the result of the ptrace call is written (instead of

 * being returned).

 */

long arch_ptrace(struct task_struct *child, long request, long addr, long data)

long arch_ptrace(struct task_struct *child, long request,

		 unsigned long addr, unsigned long data)

{

	int ret;

	unsigned long __user *datap = (unsigned long __user *)data;
@@ -141,7 +142,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
					break;

				}

				

				data += sizeof(long);

				data += sizeof(unsigned long);

			}



			break;
@@ -165,7 +166,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
				}

				

				put_reg(child, i, tmp);

				data += sizeof(long);

				data += sizeof(unsigned long);

			}

			

			break;