diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-03 13:24:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-03 13:24:57 +0100 |
| commit | d94bd41a0022ca3e14479ed7b71cc5f79f159750 (patch) | |
| tree | a3891197f6aa728655b18ca65a3c4ae66a98bb7e /drivers/tee | |
| parent | 719bc64061a6f750ea52e84d580cc53405319aa2 (diff) | |
| parent | 958567600517fd15b7f35ca1a8be0104f0eb0686 (diff) | |
Merge tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/drivers
Remove unnecessary need_resched() before cond_resched()
* tag 'optee-fix-cond-resched-call-for-v5.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
tee: optee: remove need_resched() before cond_resched()
tee: optee: replace might_sleep with cond_resched
Link: https://lore.kernel.org/r/20210203120953.GB3624453@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee')
| -rw-r--r-- | drivers/tee/optee/call.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index c981757ba0d4..7a77e375b503 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -7,6 +7,7 @@ #include <linux/err.h> #include <linux/errno.h> #include <linux/mm.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/tee_drv.h> #include <linux/types.h> @@ -148,7 +149,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg) */ optee_cq_wait_for_completion(&optee->call_queue, &w); } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) { - might_sleep(); + cond_resched(); param.a0 = res.a0; param.a1 = res.a1; param.a2 = res.a2; |