mmc: sh_mobile_sdhi: enable SDIO IRQs for RCar Gen3

[linux-2.6-block.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 2341efe7fe026f496095c4a9c1526a69cad3849a..d49bfa1e53e6b4131f1b660b249e12320ad50258 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -73,12 +73,11 @@ void __ptrace_unlink(struct task_struct *child)
 {
        BUG_ON(!child->ptrace);
 
-       child->ptrace = 0;
        child->parent = child->real_parent;
        list_del_init(&child->ptrace_entry);
 
        spin_lock(&child->sighand->siglock);
-
+       child->ptrace = 0;
        /*
         * Clear all pending traps and TRAPPING.  TRAPPING should be
         * cleared regardless of JOBCTL_STOP_PENDING.  Do it explicitly.
@@ -681,7 +680,7 @@ static int ptrace_peek_siginfo(struct task_struct *child,
                        break;
 
 #ifdef CONFIG_COMPAT
-               if (unlikely(is_compat_task())) {
+               if (unlikely(in_compat_syscall())) {
                        compat_siginfo_t __user *uinfo = compat_ptr(data);
 
                        if (copy_siginfo_to_user32(uinfo, &info) ||