Merge branch 'sched/urgent' into sched/core

Merge reason: Pick up fixes that did not make it into .32.0

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 102000d1af6f..3012355f8304 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -158,7 +158,12 @@ static int smsg_pm_restore_thaw(struct device *dev)
                 smsg_path->flags = 0;
                 rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG    ",
                                        NULL, NULL, NULL);
-                printk(KERN_ERR "iucv_path_connect returned with rc %i\n", rc);
+#ifdef CONFIG_PM_DEBUG
+                if (rc)
+                        printk(KERN_ERR
+                               "iucv_path_connect returned with rc %i\n", rc);
+#endif
+                cpcmd("SET SMSG IUCV", NULL, 0, NULL);
         }
         return 0;
 }