[RFC PATCH 40/43] ptrace, um: change signature of arch_ptrace()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Namhyung Kim
Date: Friday, August 27, 2010 - 2:42 am

change type of @addr and @data into unsigned long according to commit
f76671df26ef06321480e702770f88f61272be29 [PATCH 03/43]

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
---
 arch/um/kernel/ptrace.c     |    5 +++--
 arch/um/sys-i386/ptrace.c   |    4 ++--
 arch/um/sys-x86_64/ptrace.c |    4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index e051049..963d82b 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -42,10 +42,11 @@ void ptrace_disable(struct task_struct *child)
 extern int peek_user(struct task_struct * child, long addr, long data);
 extern int poke_user(struct task_struct * child, long addr, long data);
 
-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 i, ret;
-	unsigned long __user *p = (void __user *)(unsigned long)data;
+	unsigned long __user *p = (void __user *)data;
 
 	switch (request) {
 	/* read word at location addr. */
diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c
index c9b1765..d23b2d3 100644
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
@@ -203,8 +203,8 @@ int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 				     (unsigned long *) &fpregs);
 }
 
-long subarch_ptrace(struct task_struct *child, long request, long addr,
-		    long data)
+long subarch_ptrace(struct task_struct *child, long request,
+		    unsigned long addr, unsigned long data)
 {
 	return -EIO;
 }
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c
index f3458d7..67e6368 100644
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
@@ -175,8 +175,8 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 	return restore_fp_registers(userspace_pid[cpu], fpregs);
 }
 
-long subarch_ptrace(struct task_struct *child, long request, long addr,
-		    long data)
+long subarch_ptrace(struct task_struct *child, long request,
+		    unsigned long addr, unsigned long data)
 {
 	int ret = -EIO;
 
-- 
1.7.2.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC PATCH 00/43] ptrace cleanups, Namhyung Kim, (Fri Aug 27, 2:41 am)
[RFC PATCH 02/43] ptrace: cleanup ptrace_request(), Namhyung Kim, (Fri Aug 27, 2:41 am)
[RFC PATCH 05/43] ptrace, x86: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:41 am)
[RFC PATCH 08/43] ptrace, arm: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:41 am)
[RFC PATCH 10/43] ptrace, avr32: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:41 am)
[RFC PATCH 15/43] ptrace, frv: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 17/43] ptrace, h8300: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 20/43] ptrace, m32r: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 22/43] ptrace, m68k: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 27/43] ptrace, mips: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 36/43] ptrace, sh: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 38/43] ptrace, sparc: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 40/43] ptrace, um: change signature of arch_ptr ..., Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 41/43] ptrace, um: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
[RFC PATCH 43/43] ptrace, xtensa: cleanup arch_ptrace(), Namhyung Kim, (Fri Aug 27, 2:42 am)
Re: [RFC PATCH 02/43] ptrace: cleanup ptrace_request(), Arnd Bergmann, (Fri Aug 27, 7:23 am)
Re: [RFC PATCH 02/43] ptrace: cleanup ptrace_request(), Namhyung Kim, (Fri Aug 27, 9:13 am)
Re: [RFC PATCH 00/43] ptrace cleanups, Mike Frysinger, (Fri Aug 27, 9:30 am)
Re: [RFC PATCH 02/43] ptrace: cleanup ptrace_request(), Arnd Bergmann, (Fri Aug 27, 12:26 pm)
Re: [RFC PATCH 00/43] ptrace cleanups, Roland McGrath, (Sun Aug 29, 5:14 pm)
Re: [RFC PATCH 10/43] ptrace, avr32: cleanup arch_ptrace(), Haavard Skinnemoen, (Mon Aug 30, 5:34 am)
Re: [RFC PATCH 00/43] ptrace cleanups, Namhyung Kim, (Mon Aug 30, 7:02 am)