diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 22:59:44 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 22:59:44 +0100 |
commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /kernel/exit.c | |
parent | NFS: fix encode_fsinfo_maxsz (diff) | |
parent | nfs: don't ignore return value from nfs_pageio_add_request (diff) | |
download | linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.xz linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.zip |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index cd20bf07e9e3..53872bf993fa 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1378,7 +1378,7 @@ unlock_sig: if (!retval && infop) retval = put_user(0, &infop->si_errno); if (!retval && infop) - retval = put_user(why, &infop->si_code); + retval = put_user((short)why, &infop->si_code); if (!retval && infop) retval = put_user(exit_code, &infop->si_status); if (!retval && infop) |