From 70fd877e2fbac6ea3a6b326f0a5fc9c92f1f3fad Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Mon, 9 Aug 2010 17:20:16 -0700 Subject: [PATCH] --- yaml --- r: 207288 b: refs/heads/master c: 7833e7c961612d3031c231596f8d71d0a9b45687 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/ptrace.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 455693edd337..b259eed861f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47562277348da533f120acf2b0d4ff82a9444a1f +refs/heads/master: 7833e7c961612d3031c231596f8d71d0a9b45687 diff --git a/trunk/arch/um/kernel/ptrace.c b/trunk/arch/um/kernel/ptrace.c index 484509948ee9..e0510496596c 100644 --- a/trunk/arch/um/kernel/ptrace.c +++ b/trunk/arch/um/kernel/ptrace.c @@ -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" @@ -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 */