This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc64 / kernel / sys_ppc32.c

diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index ac7b7e6..2ac5c7d 100644 (file)
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
@@ -622,11 +622,8 @@ long sys32_execve(unsigned long a0, unsigned long a1, unsigned long a2,
 
        error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
 
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
        putname(filename);
 
 out:
@@ -1331,21 +1328,3 @@ long ppc32_timer_create(clockid_t clock,
 
        return err;
 }
-
-asmlinkage long sys32_add_key(const char __user *_type,
-                             const char __user *_description,
-                             const void __user *_payload,
-                             u32 plen,
-                             u32 ringid)
-{
-       return sys_add_key(_type, _description, _payload, plen, ringid);
-}
-
-asmlinkage long sys32_request_key(const char __user *_type,
-                                 const char __user *_description,
-                                 const char __user *_callout_info,
-                                 u32 destringid)
-{
-       return sys_request_key(_type, _description, _callout_info, destringid);
-}
-