Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[powerpc.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index d93ab2b..e0a2b44 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -847,7 +847,7 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts
        hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_REL);
        sig->it_real_incr.tv64 = 0;
        sig->real_timer.function = it_real_fn;
-       sig->real_timer.data = tsk;
+       sig->tsk = tsk;
 
        sig->it_virt_expires = cputime_zero;
        sig->it_virt_incr = cputime_zero;