diff options
Diffstat (limited to 'drivers/s390/kvm/kvm_virtio.c')
-rw-r--r-- | drivers/s390/kvm/kvm_virtio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c index 28c90b89f2b4..cbc8566fab70 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/kvm/kvm_virtio.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <asm/kvm_virtio.h> | 24 | #include <asm/kvm_virtio.h> |
25 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
26 | #include <asm/s390_ext.h> | 26 | #include <asm/s390_ext.h> |
27 | #include <asm/s390_rdev.h> | ||
28 | 27 | ||
29 | #define VIRTIO_SUBCODE_64 0x0D00 | 28 | #define VIRTIO_SUBCODE_64 0x0D00 |
30 | 29 | ||
@@ -335,7 +334,7 @@ static int __init kvm_devices_init(void) | |||
335 | if (!MACHINE_IS_KVM) | 334 | if (!MACHINE_IS_KVM) |
336 | return -ENODEV; | 335 | return -ENODEV; |
337 | 336 | ||
338 | kvm_root = s390_root_dev_register("kvm_s390"); | 337 | kvm_root = root_device_register("kvm_s390"); |
339 | if (IS_ERR(kvm_root)) { | 338 | if (IS_ERR(kvm_root)) { |
340 | rc = PTR_ERR(kvm_root); | 339 | rc = PTR_ERR(kvm_root); |
341 | printk(KERN_ERR "Could not register kvm_s390 root device"); | 340 | printk(KERN_ERR "Could not register kvm_s390 root device"); |
@@ -344,7 +343,7 @@ static int __init kvm_devices_init(void) | |||
344 | 343 | ||
345 | rc = vmem_add_mapping(real_memory_size, PAGE_SIZE); | 344 | rc = vmem_add_mapping(real_memory_size, PAGE_SIZE); |
346 | if (rc) { | 345 | if (rc) { |
347 | s390_root_dev_unregister(kvm_root); | 346 | root_device_unregister(kvm_root); |
348 | return rc; | 347 | return rc; |
349 | } | 348 | } |
350 | 349 | ||