Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71183
b: refs/heads/master
c: 0719e37
h: refs/heads/master
i:
  71181: e913a9e
  71179: 77377f2
  71175: 106138f
  71167: f069433
v: v3
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent 3fbefdd commit 942a772
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62769dce8616f4066a1349f798bdd4ef5dd8feca
refs/heads/master: 0719e3702e3ad81c51aec993a641a7d84d3ac618
4 changes: 2 additions & 2 deletions trunk/kernel/itimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}

0 comments on commit 942a772

Please sign in to comment.