Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207288
b: refs/heads/master
c: 7833e7c
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Egger authored and Linus Torvalds committed Aug 10, 2010
1 parent 838a418 commit 70fd877
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 47562277348da533f120acf2b0d4ff82a9444a1f
refs/heads/master: 7833e7c961612d3031c231596f8d71d0a9b45687
21 changes: 0 additions & 21 deletions trunk/arch/um/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#include "linux/ptrace.h"
#include "linux/sched.h"
#include "asm/uaccess.h"
#ifdef CONFIG_PROC_MM
#include "proc_mm.h"
#endif
#include "skas_ptrace.h"


Expand Down Expand Up @@ -158,24 +155,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
}
#endif
#ifdef CONFIG_PROC_MM
case PTRACE_SWITCH_MM: {
struct mm_struct *old = child->mm;
struct mm_struct *new = proc_mm_get_mm(data);

if (IS_ERR(new)) {
ret = PTR_ERR(new);
break;
}

atomic_inc(&new->mm_users);
child->mm = new;
child->active_mm = new;
mmput(old);
ret = 0;
break;
}
#endif
#ifdef PTRACE_ARCH_PRCTL
case PTRACE_ARCH_PRCTL:
/* XXX Calls ptrace on the host - needs some SMP thinking */
Expand Down

0 comments on commit 70fd877

Please sign in to comment.