diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
| commit | 1f8d31d189cc6ce1e4b972959fda41e790bb92b8 (patch) | |
| tree | fd3cca12a29319f073773ac55f7d41cc58e2c73f /fs/fcntl.c | |
| parent | 3fb5ec06578e4c85d3486b6a73cbeb07960a51ce (diff) | |
| parent | cd4175b11685b11c40e31a03e05084cc212b0649 (diff) | |
| download | linux-rt-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 0491da3b28c3..448a1119f0be 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -749,7 +749,7 @@ static void send_sigio_to_task(struct task_struct *p, * specific si_codes. In that case use SI_SIGIO instead * to remove the ambiguity. */ - if (sig_specific_sicodes(signum)) + if ((signum != SIGPOLL) && sig_specific_sicodes(signum)) si.si_code = SI_SIGIO; /* Make sure we are called with one of the POLL_* |