diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-10-27 18:33:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:10 -0400 |
commit | 9b05a69e0534ec70bc94921936ffa05b330507cb (patch) | |
tree | 4116a7b7db286edf9486a29a7742d47fa67baa68 /arch/x86/kernel/ptrace.c | |
parent | 9fed81dc40f5a1ac2783bcc78d4029873be72894 (diff) |
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: Namhyung Kim <namhyung@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Acked-by: Roland McGrath <roland@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
-rw-r--r-- | arch/x86/kernel/ptrace.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 70c4872cd8aa..1a7ca045920d 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
@@ -801,7 +801,8 @@ void ptrace_disable(struct task_struct *child) | |||
801 | static const struct user_regset_view user_x86_32_view; /* Initialized below. */ | 801 | static const struct user_regset_view user_x86_32_view; /* Initialized below. */ |
802 | #endif | 802 | #endif |
803 | 803 | ||
804 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 804 | long arch_ptrace(struct task_struct *child, long request, |
805 | unsigned long addr, unsigned long data) | ||
805 | { | 806 | { |
806 | int ret; | 807 | int ret; |
807 | unsigned long __user *datap = (unsigned long __user *)data; | 808 | unsigned long __user *datap = (unsigned long __user *)data; |
@@ -888,14 +889,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
888 | 889 | ||
889 | #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION | 890 | #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION |
890 | case PTRACE_GET_THREAD_AREA: | 891 | case PTRACE_GET_THREAD_AREA: |
891 | if (addr < 0) | 892 | if ((int) addr < 0) |
892 | return -EIO; | 893 | return -EIO; |
893 | ret = do_get_thread_area(child, addr, | 894 | ret = do_get_thread_area(child, addr, |
894 | (struct user_desc __user *) data); | 895 | (struct user_desc __user *) data); |
895 | break; | 896 | break; |
896 | 897 | ||
897 | case PTRACE_SET_THREAD_AREA: | 898 | case PTRACE_SET_THREAD_AREA: |
898 | if (addr < 0) | 899 | if ((int) addr < 0) |
899 | return -EIO; | 900 | return -EIO; |
900 | ret = do_set_thread_area(child, addr, | 901 | ret = do_set_thread_area(child, addr, |
901 | (struct user_desc __user *) data, 0); | 902 | (struct user_desc __user *) data, 0); |