Pull cpuidle into release branch

[linux-2.6] / arch / s390 / kernel / ptrace.c

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 28afff4e5d1b3594f33b2f0141a5d4d7fe53e4f7..1d81bf9488aec20b968e305b2acf57fcd6d0bd85 100644 (file)
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -314,10 +314,7 @@ do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
                /* Remove high order bit from address (only for 31 bit). */
                addr &= PSW_ADDR_INSN;
                /* write the word at location addr. */
-               copied = access_process_vm(child, addr, &data, sizeof(data),1);
-               if (copied != sizeof(data))
-                       return -EIO;
-               return 0;
+               return generic_ptrace_pokedata(child, addr, data);
 
        case PTRACE_POKEUSR:
                /* write the word at location addr in the USER area */
@@ -686,11 +683,6 @@ do_ptrace(struct task_struct *child, long request, long addr, long data)
                wake_up_process(child);
                return 0;
 
-       case PTRACE_DETACH:
-               /* detach a process that was attached. */
-               return ptrace_detach(child, data);
-
-
        /* Do requests that differ for 31/64 bit */
        default:
 #ifdef CONFIG_COMPAT