diff options
author | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
commit | 12456e509be25d24fe479394852428517922d02a (patch) | |
tree | 8b1e8e1025ce1beb350bbf977ac8b8ffdd5fbfa1 /include/linux/sunrpc/sched.h | |
parent | Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Linux 5.1-rc7 (diff) | |
download | kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.gz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.xz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.zip |
Merge 5.1-rc7 into usb-next
We need this to make the usb-gadget branch merge cleaner. And for
testing to keep from hitting the same issues already fixed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sunrpc/sched.h')
-rw-r--r-- | include/linux/sunrpc/sched.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h index ec861cd0cfe8..52d41d0c1ae1 100644 --- a/include/linux/sunrpc/sched.h +++ b/include/linux/sunrpc/sched.h @@ -304,12 +304,4 @@ rpc_clnt_swap_deactivate(struct rpc_clnt *clnt) } #endif /* CONFIG_SUNRPC_SWAP */ -static inline bool -rpc_task_need_resched(const struct rpc_task *task) -{ - if (RPC_IS_QUEUED(task) || task->tk_callback) - return true; - return false; -} - #endif /* _LINUX_SUNRPC_SCHED_H_ */ |