Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / arch / powerpc / kernel / ptrace.c

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index dd5e214cdf21ec13ce19a6448572a0c937794d65..c10fc28b90920120a12c4bc6cc5c39dbf2780e6a 100644 (file)
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -1432,40 +1432,6 @@ static long ppc_del_hwdebug(struct task_struct *child, long addr, long data)
 #endif
 }
 
-/*
- * Here are the old "legacy" powerpc specific getregs/setregs ptrace calls,
- * we mark them as obsolete now, they will be removed in a future version
- */
-static long arch_ptrace_old(struct task_struct *child, long request,
-                           unsigned long addr, unsigned long data)
-{
-       void __user *datavp = (void __user *) data;
-
-       switch (request) {
-       case PPC_PTRACE_GETREGS:        /* Get GPRs 0 - 31. */
-               return copy_regset_to_user(child, &user_ppc_native_view,
-                                          REGSET_GPR, 0, 32 * sizeof(long),
-                                          datavp);
-
-       case PPC_PTRACE_SETREGS:        /* Set GPRs 0 - 31. */
-               return copy_regset_from_user(child, &user_ppc_native_view,
-                                            REGSET_GPR, 0, 32 * sizeof(long),
-                                            datavp);
-
-       case PPC_PTRACE_GETFPREGS:      /* Get FPRs 0 - 31. */
-               return copy_regset_to_user(child, &user_ppc_native_view,
-                                          REGSET_FPR, 0, 32 * sizeof(double),
-                                          datavp);
-
-       case PPC_PTRACE_SETFPREGS:      /* Set FPRs 0 - 31. */
-               return copy_regset_from_user(child, &user_ppc_native_view,
-                                            REGSET_FPR, 0, 32 * sizeof(double),
-                                            datavp);
-       }
-
-       return -EPERM;
-}
-
 long arch_ptrace(struct task_struct *child, long request,
                 unsigned long addr, unsigned long data)
 {
@@ -1687,14 +1653,6 @@ long arch_ptrace(struct task_struct *child, long request,
                                             datavp);
 #endif
 
-       /* Old reverse args ptrace callss */
-       case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
-       case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
-       case PPC_PTRACE_GETFPREGS: /* Get FPRs 0 - 31. */
-       case PPC_PTRACE_SETFPREGS: /* Get FPRs 0 - 31. */
-               ret = arch_ptrace_old(child, request, addr, data);
-               break;
-
        default:
                ret = ptrace_request(child, request, addr, data);
                break;