diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-07-24 04:48:28 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-07-24 04:48:22 -0400 |
commit | 5beab99100335936f4d845f9ae2f0e25796f2584 (patch) | |
tree | 001c61d9a2250caf3081aea8ab19590fb8fe6f1b /net/iucv | |
parent | 89c9b66b104549a8698e412bf6f4140c1d0786fb (diff) |
[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>
Diffstat (limited to 'net/iucv')
-rw-r--r-- | net/iucv/iucv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index 7f9124914b13..f2b713847b45 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c | |||
@@ -1988,12 +1988,13 @@ static int __init iucv_init(void) | |||
1988 | rc = -EPROTONOSUPPORT; | 1988 | rc = -EPROTONOSUPPORT; |
1989 | goto out; | 1989 | goto out; |
1990 | } | 1990 | } |
1991 | ctl_set_bit(0, 1); | ||
1991 | rc = iucv_query_maxconn(); | 1992 | rc = iucv_query_maxconn(); |
1992 | if (rc) | 1993 | if (rc) |
1993 | goto out; | 1994 | goto out_ctl; |
1994 | rc = register_external_interrupt(0x4000, iucv_external_interrupt); | 1995 | rc = register_external_interrupt(0x4000, iucv_external_interrupt); |
1995 | if (rc) | 1996 | if (rc) |
1996 | goto out; | 1997 | goto out_ctl; |
1997 | iucv_root = root_device_register("iucv"); | 1998 | iucv_root = root_device_register("iucv"); |
1998 | if (IS_ERR(iucv_root)) { | 1999 | if (IS_ERR(iucv_root)) { |
1999 | rc = PTR_ERR(iucv_root); | 2000 | rc = PTR_ERR(iucv_root); |
@@ -2055,6 +2056,8 @@ out_free: | |||
2055 | root_device_unregister(iucv_root); | 2056 | root_device_unregister(iucv_root); |
2056 | out_int: | 2057 | out_int: |
2057 | unregister_external_interrupt(0x4000, iucv_external_interrupt); | 2058 | unregister_external_interrupt(0x4000, iucv_external_interrupt); |
2059 | out_ctl: | ||
2060 | ctl_clear_bit(0, 1); | ||
2058 | out: | 2061 | out: |
2059 | return rc; | 2062 | return rc; |
2060 | } | 2063 | } |