diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-17 16:51:59 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-17 16:51:59 +0200 |
| commit | efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648 (patch) | |
| tree | e7261ab57ded208c8425797e052ae562343ee618 /virt/kvm | |
| parent | KVM: s390: Replace incorrect atomic_or with atomic_andnot (diff) | |
| parent | arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS' (diff) | |
| download | linux-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.tar.xz linux-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.zip | |
Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
Second set of KVM/ARM changes for 4.3-rc2
- Workaround for a Cortex-A57 erratum
- Bug fix for the debugging infrastructure
- Fix for 32bit guests with more than 4GB of address space
on a 32bit host
- A number of fixes for the (unusual) case when we don't use
the in-kernel GIC emulation
- Removal of ThumbEE handling on arm64, since these have been
dropped from the architecture before anyone actually ever
built a CPU
- Remove the KVM_ARM_MAX_VCPUS limitation which has become
fairly pointless
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/arm/vgic-v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c index afbf925b00f4..7dd5d62f10a1 100644 --- a/virt/kvm/arm/vgic-v3.c +++ b/virt/kvm/arm/vgic-v3.c @@ -288,7 +288,7 @@ int vgic_v3_probe(struct device_node *vgic_node, vgic->vctrl_base = NULL; vgic->type = VGIC_V3; - vgic->max_gic_vcpus = KVM_MAX_VCPUS; + vgic->max_gic_vcpus = VGIC_V3_MAX_CPUS; kvm_info("%s@%llx IRQ%d\n", vgic_node->name, vcpu_res.start, vgic->maint_irq); |