Home Home > GIT Browse > openSUSE-15.2
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-09-14 01:54:04 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-09-14 01:54:30 +0200
commitf3297bb203a2f74f38fbf430a230cf81f6eaa3e3 (patch)
tree9244176d0d8e3116168249998edf16db4a64a150
parentcac2c4efa666bf19e85a55622a0a9b43c6384c4e (diff)
parenta70b17b271b727b24885765b0ab82a1ec8cb5d0c (diff)
Merge branch 'users/msuchanek/SLE15-SP2/for-next' into SLE15-SP2
Pull powerpc fix from Michal Suchanek. suse-commit: 34e5b855187b82f663db4d49d35d2bfa4ef188bf
-rw-r--r--arch/powerpc/platforms/pseries/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f5940cc71c37..63462e96cf0e 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -316,6 +316,9 @@ static void pseries_lpar_idle(void)
* low power mode by ceding processor to hypervisor
*/
+ if (!prep_irq_for_idle())
+ return;
+
/* Indicate to hypervisor that we are idle. */
get_lppaca()->idle = 1;