diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
| commit | cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49 (patch) | |
| tree | 6cbcf7e9d87bc571b80ec1f75b5cb21a8e34b937 /net/strparser | |
| parent | a555e9d86ee384d9d3cb3310a57aed33f7e053d4 (diff) | |
| parent | 541676078b52f365f53d46ee5517d305cd1b6350 (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/strparser')
| -rw-r--r-- | net/strparser/strparser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index c5fda15ba319..1fdab5c4eda8 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -401,7 +401,7 @@ void strp_data_ready(struct strparser *strp) * allows a thread in BH context to safely check if the process * lock is held. In this case, if the lock is held, queue work. */ - if (sock_owned_by_user(strp->sk)) { + if (sock_owned_by_user_nocheck(strp->sk)) { queue_work(strp_wq, &strp->work); return; } |