diff --git a/[refs] b/[refs] index f47fb74560cb..41f0d1e18373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62769dce8616f4066a1349f798bdd4ef5dd8feca +refs/heads/master: 0719e3702e3ad81c51aec993a641a7d84d3ac618 diff --git a/trunk/kernel/itimer.c b/trunk/kernel/itimer.c index 3205e8e114fa..2fab344dbf56 100644 --- a/trunk/kernel/itimer.c +++ b/trunk/kernel/itimer.c @@ -130,7 +130,7 @@ 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); @@ -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; }