[S390] iucv cr0 enablement bit

Do not set the cr0 enablement bit for iucv by default in head[31|64].S,
move the enablement to iucv_init in the iucv base layer.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index dd0d1e272be9bdcbcf4992b1a92579656442c545..f21954b44dc1ec1c5a80249b855bd4214cd528d8 100644 (file)
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -45,7 +45,7 @@ ENTRY(startup_continue)
                                        # virtual and never return ...
        .align  8
 .Lentry:.long  0x00080000,0x80000000 + _stext
-.Lctl: .long   0x04b50002              # cr0: various things
+.Lctl: .long   0x04b50000              # cr0: various things
        .long   0                       # cr1: primary space segment table
        .long   .Lduct                  # cr2: dispatchable unit control table
        .long   0                       # cr3: instruction authorization

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 188602898c174b43137faae7988646555bd0b11e..b6d30135e2ec72ab25734386a956a85202f590fb 100644 (file)
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -46,7 +46,7 @@ ENTRY(startup_continue)
        .align  16
 .LPG1:
 .Lentry:.quad  0x0000000180000000,_stext
-.Lctl: .quad   0x04350002              # cr0: various things
+.Lctl: .quad   0x04350000              # cr0: various things
        .quad   0                       # cr1: primary space segment table
        .quad   .Lduct                  # cr2: dispatchable unit control table
        .quad   0                       # cr3: instruction authorization

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 7f9124914b139b062c71ccc3d526433dc9109ef4..f2b713847b4596209e87544995cd6a8193e4640e 100644 (file)
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -1988,12 +1988,13 @@ static int __init iucv_init(void)
                rc = -EPROTONOSUPPORT;
                goto out;
        }
+       ctl_set_bit(0, 1);
        rc = iucv_query_maxconn();
        if (rc)
-               goto out;
+               goto out_ctl;
        rc = register_external_interrupt(0x4000, iucv_external_interrupt);
        if (rc)
-               goto out;
+               goto out_ctl;
        iucv_root = root_device_register("iucv");
        if (IS_ERR(iucv_root)) {
                rc = PTR_ERR(iucv_root);
@@ -2055,6 +2056,8 @@ out_free:
        root_device_unregister(iucv_root);
 out_int:
        unregister_external_interrupt(0x4000, iucv_external_interrupt);
+out_ctl:
+       ctl_clear_bit(0, 1);
 out:
        return rc;
 }