projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-arm-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
[cascardo/linux.git]
/
virt
/
kvm
/
arm
/
vgic
/
vgic-mmio.c
diff --git
a/virt/kvm/arm/vgic/vgic-mmio.c
b/virt/kvm/arm/vgic/vgic-mmio.c
index
3bad3c5
..
e18b30d
100644
(file)
--- a/
virt/kvm/arm/vgic/vgic-mmio.c
+++ b/
virt/kvm/arm/vgic/vgic-mmio.c
@@
-550,11
+550,9
@@
int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address,
case VGIC_V2:
len = vgic_v2_init_dist_iodev(io_device);
break;
-#ifdef CONFIG_KVM_ARM_VGIC_V3
case VGIC_V3:
len = vgic_v3_init_dist_iodev(io_device);
break;
-#endif
default:
BUG_ON(1);
}