diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 16:34:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 16:34:43 +0100 |
| commit | 8c54436ae9f59146b3d02820a3ebbf71e61f2aee (patch) | |
| tree | 0ab1a3847809bd7d5f44fc52b1f16fabd953c4bb /arch/blackfin/kernel/ptrace.c | |
| parent | 5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a (diff) | |
| parent | 7a203f3b089be4410fe065dd9927027eade94557 (diff) | |
| download | kernel_samsung_aries-8c54436ae9f59146b3d02820a3ebbf71e61f2aee.zip kernel_samsung_aries-8c54436ae9f59146b3d02820a3ebbf71e61f2aee.tar.gz kernel_samsung_aries-8c54436ae9f59146b3d02820a3ebbf71e61f2aee.tar.bz2 | |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'arch/blackfin/kernel/ptrace.c')
| -rw-r--r-- | arch/blackfin/kernel/ptrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c index 594e325..d76618d 100644 --- a/arch/blackfin/kernel/ptrace.c +++ b/arch/blackfin/kernel/ptrace.c @@ -45,6 +45,7 @@ #include <asm/asm-offsets.h> #include <asm/dma.h> #include <asm/fixed_code.h> +#include <asm/cacheflush.h> #include <asm/mem_map.h> #define TEXT_OFFSET 0 @@ -240,7 +241,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) } else if (addr >= FIXED_CODE_START && addr + sizeof(tmp) <= FIXED_CODE_END) { - memcpy(&tmp, (const void *)(addr), sizeof(tmp)); + copy_from_user_page(0, 0, 0, &tmp, (const void *)(addr), sizeof(tmp)); copied = sizeof(tmp); } else @@ -320,7 +321,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) } else if (addr >= FIXED_CODE_START && addr + sizeof(data) <= FIXED_CODE_END) { - memcpy((void *)(addr), &data, sizeof(data)); + copy_to_user_page(0, 0, 0, (void *)(addr), &data, sizeof(data)); copied = sizeof(data); } else |