diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:37:12 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:37:12 +0100 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/i386/kernel/ptrace.c | |
| parent | ppc: remove duplicate export of cur_cpu_spec (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz linux-23fd07750a789a66fe88cf173d52a18f1a387da4.zip | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/i386/kernel/ptrace.c')
| -rw-r--r-- | arch/i386/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 7b6368bf8974..efd11f09c996 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c @@ -354,7 +354,7 @@ ptrace_set_thread_area(struct task_struct *child, return 0; } -asmlinkage int sys_ptrace(long request, long pid, long addr, long data) +asmlinkage long sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; struct user * dummy = NULL; |