These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / cio / css.c

diff --git a/kernel/drivers/s390/cio/css.c b/kernel/drivers/s390/cio/css.c
index 0268e5f..489e703 100644 (file)
--- a/kernel/drivers/s390/cio/css.c
+++ b/kernel/drivers/s390/cio/css.c
@@ -44,7 +44,6 @@ for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)
        int ret;
 
        init_subchannel_id(&schid);
-       ret = -ENODEV;
        do {
                do {
                        ret = fn(schid, data);
@@ -703,17 +702,12 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
                css->global_pgid.pgid_high.ext_cssid.version = 0x80;
                css->global_pgid.pgid_high.ext_cssid.cssid = css->cssid;
        } else {
-#ifdef CONFIG_SMP
                css->global_pgid.pgid_high.cpu_addr = stap();
-#else
-               css->global_pgid.pgid_high.cpu_addr = 0;
-#endif
        }
        get_cpu_id(&cpu_id);
        css->global_pgid.cpu_id = cpu_id.ident;
        css->global_pgid.cpu_model = cpu_id.machine;
        css->global_pgid.tod_high = tod_high;
-
 }
 
 static void
@@ -1089,6 +1083,7 @@ void channel_subsystem_reinit(void)
                if (chp)
                        chp_update_desc(chp);
        }
+       cmf_reactivate();
 }
 
 #ifdef CONFIG_PROC_FS