Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up fixes and move base from -rc1 to -rc5.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index f780bdd3a04e..2490b741e16a 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1250,8 +1250,7 @@ static int io_subchannel_probe(struct subchannel *sch)
         unsigned long flags;
         struct ccw_dev_id dev_id;
 
-        cdev = sch_get_cdev(sch);
-        if (cdev) {
+        if (cio_is_console(sch->schid)) {
                 rc = sysfs_create_group(&sch->dev.kobj,
                                         &io_subchannel_attr_group);
                 if (rc)
@@ -1260,13 +1259,13 @@ static int io_subchannel_probe(struct subchannel *sch)
                                       "0.%x.%04x (rc=%d)\n",
                                       sch->schid.ssid, sch->schid.sch_no, rc);
                 /*
-                 * This subchannel already has an associated ccw_device.
+                 * The console subchannel already has an associated ccw_device.
                  * Throw the delayed uevent for the subchannel, register
-                 * the ccw_device and exit. This happens for all early
-                 * devices, e.g. the console.
+                 * the ccw_device and exit.
                  */
                 dev_set_uevent_suppress(&sch->dev, 0);
                 kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
+                cdev = sch_get_cdev(sch);
                 cdev->dev.groups = ccwdev_attr_groups;
                 device_initialize(&cdev->dev);
                 ccw_device_register(cdev);
@@ -1609,7 +1608,7 @@ int ccw_purge_blacklisted(void)
         return 0;
 }
 
-static void device_set_disconnected(struct ccw_device *cdev)
+void ccw_device_set_disconnected(struct ccw_device *cdev)
 {
         if (!cdev)
                 return;
@@ -1705,7 +1704,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
                 ccw_device_trigger_reprobe(cdev);
                 break;
         case DISC:
-                device_set_disconnected(cdev);
+                ccw_device_set_disconnected(cdev);
                 break;
         default:
                 break;