Commit:     0fc3ddd67a6781238b038165d9dd8c1f9ba81111
Parent:     33583c3657ef30cd7f4cb563071ac23cb6ff69a0
Author:     Christian Borntraeger <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 5 11:10:08 2007 +0100
Committer:  Martin Schwidefsky <[EMAIL PROTECTED]>
CommitDate: Mon Nov 5 11:10:16 2007 +0100

    [S390] Fix smsgiucv init on no iucv machines
    smsgiucv is a driver that relies on iucv to work properly. If
    iucv ans smsgiucv are compiled into the kernel and run on an
    lpar the following scenario happens:
    iucv is initialized early as a subsystem. It checks for z/VM and
    returns with EPROTONOTSUPPORT. Later smsgiucv tries to run
    driver_register with iucv_bus as bus. As this bus is not
    initialized the driver core and list debugging issue several
    warnings and oopses.
    Solution is to let smsgiucv also check for z/VM and return
    Signed-off-by: Christian Borntraeger <[EMAIL PROTECTED]>
    Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
 drivers/s390/net/smsgiucv.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 3ccca58..47bb47b 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -148,6 +148,10 @@ static int __init smsg_init(void)
        int rc;
+       if (!MACHINE_IS_VM) {
+               rc = -EPROTONOSUPPORT;
+               goto out;
+       }
        rc = driver_register(&smsg_driver);
        if (rc != 0)
                goto out;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to