diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /arch/um | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/ptrace-generic.h | 4 | ||||
| -rw-r--r-- | arch/um/kernel/ptrace.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 2cd899f75a3c..b7c5bab9bd77 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h | |||
| @@ -38,8 +38,8 @@ struct pt_regs { | |||
| 38 | 38 | ||
| 39 | struct task_struct; | 39 | struct task_struct; |
| 40 | 40 | ||
| 41 | extern long subarch_ptrace(struct task_struct *child, long request, long addr, | 41 | extern long subarch_ptrace(struct task_struct *child, long request, |
| 42 | long data); | 42 | unsigned long addr, unsigned long data); |
| 43 | extern unsigned long getreg(struct task_struct *child, int regno); | 43 | extern unsigned long getreg(struct task_struct *child, int regno); |
| 44 | extern int putreg(struct task_struct *child, int regno, unsigned long value); | 44 | extern int putreg(struct task_struct *child, int regno, unsigned long value); |
| 45 | extern int get_fpregs(struct user_i387_struct __user *buf, | 45 | extern int get_fpregs(struct user_i387_struct __user *buf, |
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index a5e33f29bbeb..701b672c1122 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c | |||
| @@ -122,7 +122,7 @@ long arch_ptrace(struct task_struct *child, long request, | |||
| 122 | break; | 122 | break; |
| 123 | 123 | ||
| 124 | case PTRACE_SET_THREAD_AREA: | 124 | case PTRACE_SET_THREAD_AREA: |
| 125 | ret = ptrace_set_thread_area(child, addr, datavp); | 125 | ret = ptrace_set_thread_area(child, addr, vp); |
| 126 | break; | 126 | break; |
| 127 | 127 | ||
| 128 | case PTRACE_FAULTINFO: { | 128 | case PTRACE_FAULTINFO: { |