Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208531
b: refs/heads/master
c: a2a20c4
h: refs/heads/master
i:
  208529: 09f5337
  208527: a532cbd
v: v3
  • Loading branch information
Nathan Lynch authored and Linus Torvalds committed Aug 11, 2010
1 parent 1afea9a commit b296a70
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c7e49c1488ab20342eaaf38f1ca35a207f4c051d
refs/heads/master: a2a20c412c86e0bb46a9ab0dd31bcfe6d201b913
2 changes: 2 additions & 0 deletions trunk/fs/signalfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
err |= __put_user(kinfo->si_tid, &uinfo->ssi_tid);
err |= __put_user(kinfo->si_overrun, &uinfo->ssi_overrun);
err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);
err |= __put_user(kinfo->si_int, &uinfo->ssi_int);
break;
case __SI_POLL:
err |= __put_user(kinfo->si_band, &uinfo->ssi_band);
Expand All @@ -111,6 +112,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid);
err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid);
err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);
err |= __put_user(kinfo->si_int, &uinfo->ssi_int);
break;
default:
/*
Expand Down

0 comments on commit b296a70

Please sign in to comment.