From b296a70ae5ea448cda73a1e4d443978939ffe6cd Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Tue, 10 Aug 2010 18:03:08 -0700 Subject: [PATCH] --- yaml --- r: 208531 b: refs/heads/master c: a2a20c412c86e0bb46a9ab0dd31bcfe6d201b913 h: refs/heads/master i: 208529: 09f533798295dc47fde4dfb0b7a39843dd4290d2 208527: a532cbd844a51917bb1736b15f224fca09a1f132 v: v3 --- [refs] | 2 +- trunk/fs/signalfd.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e2f7259d0e93..5fb89c8741b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7e49c1488ab20342eaaf38f1ca35a207f4c051d +refs/heads/master: a2a20c412c86e0bb46a9ab0dd31bcfe6d201b913 diff --git a/trunk/fs/signalfd.c b/trunk/fs/signalfd.c index f329849ce3c0..1c5a6add779d 100644 --- a/trunk/fs/signalfd.c +++ b/trunk/fs/signalfd.c @@ -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); @@ -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: /*