diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:33:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:33:21 +0100 |
| commit | 480c93df5b99699390f93a7024c9f60d09da0e96 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /arch/um | |
| parent | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] (diff) | |
| download | linux-480c93df5b99699390f93a7024c9f60d09da0e96.tar.xz linux-480c93df5b99699390f93a7024c9f60d09da0e96.zip | |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/ptrace.c | 5 | ||||
| -rw-r--r-- | arch/um/os-Linux/user_syms.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index 15e8b7c4de13..8e3d69e4fcb5 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c @@ -64,6 +64,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret = poke_user(child, addr, data); break; + case PTRACE_SYSEMU: + case PTRACE_SYSEMU_SINGLESTEP: + ret = -EIO; + break; + /* continue and stop at next (return from) syscall */ case PTRACE_SYSCALL: /* restart after signal. */ diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c index 74f49bb9b125..89b48a116a89 100644 --- a/arch/um/os-Linux/user_syms.c +++ b/arch/um/os-Linux/user_syms.c @@ -14,7 +14,6 @@ #undef memset extern size_t strlen(const char *); -extern void *memcpy(void *, const void *, size_t); extern void *memmove(void *, const void *, size_t); extern void *memset(void *, int, size_t); extern int printf(const char *, ...); @@ -24,7 +23,11 @@ extern int printf(const char *, ...); EXPORT_SYMBOL(strstr); #endif +#ifndef __x86_64__ +extern void *memcpy(void *, const void *, size_t); EXPORT_SYMBOL(memcpy); +#endif + EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(memset); EXPORT_SYMBOL(printf); |