Merge tag 'optee-rcu-sched-trace-for-v5.11' of git://git.linaro.org/people/jens.wikla...
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 Jan 2021 14:13:07 +0000 (15:13 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 22 Jan 2021 14:13:08 +0000 (15:13 +0100)
Fix rcu_sched trace from OP-TEE invoke

Replaces might_sleep() with a conditional call to cond_resched()
in order to avoid the rcu_sched trace in some corner cases.

* tag 'optee-rcu-sched-trace-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: replace might_sleep with cond_resched

Link: https://lore.kernel.org/r/20210122074234.GA1074747@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge