History

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini: "A somewhat bigger ARM update, and the usual smattering of x86 bug fixes" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: kvm: vmx: Fix entry number check for add_atomic_switch_msr() KVM: x86: Recompute PID.ON when clearing PID.SN KVM: nVMX: Restore a preemption timer consistency check x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available KVM: arm64: Forbid kprobing of the VHE world-switch code KVM: arm64: Relax the restriction on using stage2 PUD huge mapping arm: KVM: Add missing kvm_stage2_has_pmd() helper KVM: arm/arm64: vgic: Always initialize the group of private IRQs arm/arm64: KVM: Don't panic on failure to properly reset system registers arm/arm64: KVM: Allow a VCPU to fully reset itself KVM: arm/arm64: Reset the VCPU without preemption and vcpu state loaded arm64: KVM: Don't generate UNDEF when LORegion feature is present KVM: arm/arm64: vgic: Make vgic_cpu->ap_list_lock a raw_spinlock KVM: arm/arm64: vgic: Make vgic_dist->lpi_list_lock a raw_spinlock KVM: arm/arm64: vgic: Make vgic_irq->irq_lock a raw_spinlock

Linus Torvalds committed 7 years ago

Commit ed0a0ec2 parents 64c0133 98ae70c26 files · +331 −193Browse files

Showing the changes to include (1 of 26 files). Show all

Unified · Split

include/kvm/arm_vgic.h+3−3
@@ -100,7 +100,7 @@ enum vgic_irq_config { · 99 unmodified lines
100};100};
101 101
102struct vgic_irq {102struct vgic_irq {
103 spinlock_t irq_lock; /* Protects the content of the struct */103 raw_spinlock_t irq_lock; /* Protects the content of the struct */
104 struct list_head lpi_list; /* Used to link all LPIs together */104 struct list_head lpi_list; /* Used to link all LPIs together */
105 struct list_head ap_list;105 struct list_head ap_list;
106 106
@@ -256,7 +256,7 @@ struct vgic_dist { · 149 unmodified lines
256 u64 propbaser;256 u64 propbaser;
257 257
258 /* Protects the lpi_list and the count value below. */258 /* Protects the lpi_list and the count value below. */
259 spinlock_t lpi_list_lock;259 raw_spinlock_t lpi_list_lock;
260 struct list_head lpi_list_head;260 struct list_head lpi_list_head;
261 int lpi_list_count;261 int lpi_list_count;
262 262
@@ -307,7 +307,7 @@ struct vgic_cpu { · 44 unmodified lines
307 unsigned int used_lrs;307 unsigned int used_lrs;
308 struct vgic_irq private_irqs[VGIC_NR_PRIVATE_IRQS];308 struct vgic_irq private_irqs[VGIC_NR_PRIVATE_IRQS];
309 309
310 spinlock_t ap_list_lock; /* Protects the ap_list */310 raw_spinlock_t ap_list_lock; /* Protects the ap_list */
311 311
312 /*312 /*
313 * List of IRQs that this VCPU should consider because they are either313 * List of IRQs that this VCPU should consider because they are either