[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1228931139-12956-5-git-send-email-markmc@redhat.com>
Date: Wed, 10 Dec 2008 17:45:38 +0000
From: Mark McLoughlin <markmc@...hat.com>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: linux-kernel@...r.kernel.org,
virtualization@...ts.linux-foundation.org,
Anthony Liguori <aliguori@...ibm.com>,
Kay Sievers <kay.sievers@...y.org>, Greg KH <gregkh@...e.de>,
Mark McLoughlin <markmc@...hat.com>,
Christian Borntraeger <borntraeger@...ibm.com>
Subject: [PATCH 5/6] kvm-s390: use register_virtio_root_device()
This is basically a no-op change, since it does exactly the
same thing as s390_root_dev_register() when the caller isn't
a module.
Signed-off-by: Mark McLoughlin <markmc@...hat.com>
Cc: Christian Borntraeger <borntraeger@...ibm.com>
---
drivers/s390/kvm/kvm_virtio.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index c79cf05..d3f7d94 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -335,7 +335,7 @@ static int __init kvm_devices_init(void)
if (!MACHINE_IS_KVM)
return -ENODEV;
- kvm_root = s390_root_dev_register("kvm_s390");
+ kvm_root = register_virtio_root_device("kvm_s390");
if (IS_ERR(kvm_root)) {
rc = PTR_ERR(kvm_root);
printk(KERN_ERR "Could not register kvm_s390 root device");
@@ -344,7 +344,7 @@ static int __init kvm_devices_init(void)
rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
if (rc) {
- s390_root_dev_unregister(kvm_root);
+ unregister_virtio_root_device(kvm_root);
return rc;
}
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists