diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 09:29:52 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 09:29:52 +0100 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /arch/um/kernel/ptrace.c | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
| download | talos-op-linux-354d14b3f53cc749c5d26d4ba7280d1e931d6bc4.tar.gz talos-op-linux-354d14b3f53cc749c5d26d4ba7280d1e931d6bc4.zip | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'arch/um/kernel/ptrace.c')
| -rw-r--r-- | arch/um/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, break; case PTRACE_SET_THREAD_AREA: - ret = ptrace_set_thread_area(child, addr, datavp); + ret = ptrace_set_thread_area(child, addr, vp); break; case PTRACE_FAULTINFO: { |
