Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / kernel / itimer.c

diff --git a/kernel/itimer.c b/kernel/itimer.c
index 3205e8e114fa361eff4a1698c9a3ec2bbf4e730f..ab982747d9bd8121c19b3327b96c7760adb7577e 100644 (file)
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -130,9 +130,9 @@ asmlinkage long sys_getitimer(int which, struct itimerval __user *value)
 enum hrtimer_restart it_real_fn(struct hrtimer *timer)
 {
        struct signal_struct *sig =
-           container_of(timer, struct signal_struct, real_timer);
+               container_of(timer, struct signal_struct, real_timer);
 
-       send_group_sig_info(SIGALRM, SEND_SIG_PRIV, sig->tsk);
+       kill_pid_info(SIGALRM, SEND_SIG_PRIV, sig->leader_pid);
 
        return HRTIMER_NORESTART;
 }
@@ -291,6 +291,6 @@ asmlinkage long sys_setitimer(int which,
                return error;
 
        if (copy_to_user(ovalue, &get_buffer, sizeof(get_buffer)))
-               return -EFAULT; 
+               return -EFAULT;
        return 0;
 }