Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-05-16 20:39:52 +0200
committerJiri Kosina <jkosina@suse.cz>2018-05-16 20:39:52 +0200
commit4787fa0dcb96f1795df9f6aa6ee05c6b78523065 (patch)
tree003d22cdf6c9e94f631a5a3af8149a422542ee4a
parent1aa2f11527a81ef66d18902f6698b2d87702991a (diff)
parentbca907c42849a05ffd692c2c0d9c55eb20bf2edf (diff)
Merge remote-tracking branch 'origin/users/msuchanek/SLE15/for-next' into SLE15
-rw-r--r--arch/powerpc/sysdev/xive/spapr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index 97ea0a67a173..575db3b06a6b 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -128,10 +128,9 @@ static unsigned int plpar_busy_delay(int rc)
{
unsigned int ms;
- might_sleep();
ms = plpar_busy_delay_time(rc);
- if (ms && need_resched())
- msleep(ms);
+ if (ms)
+ mdelay(ms);
return ms;
}