Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f65f150 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents baa45633 6a251b0a

arch/powerpc/kvm/44x_tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws) 
	unsigned int gtlb_index;



	gtlb_index = kvmppc_get_gpr(vcpu, ra);

	if (gtlb_index > KVM44x_GUEST_TLB_SIZE) {

	if (gtlb_index >= KVM44x_GUEST_TLB_SIZE) {

		printk("%s: index %d\n", __func__, gtlb_index);

		kvmppc_dump_vcpu(vcpu);

		return EMULATE_FAIL;

arch/x86/kvm/svm.c

+4 −4
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ static int cpuid_interception(struct vcpu_svm *svm) 
static int iret_interception(struct vcpu_svm *svm)

{

	++svm->vcpu.stat.nmi_window_exits;

	svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);

	svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);

	svm->vcpu.arch.hflags |= HF_IRET_MASK;

	return 1;

}
@@ -2479,7 +2479,7 @@ static void svm_inject_nmi(struct kvm_vcpu *vcpu) 


	svm->vmcb->control.event_inj = SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_NMI;

	vcpu->arch.hflags |= HF_NMI_MASK;

	svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);

	svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);

	++vcpu->stat.nmi_injections;

}
@@ -2539,10 +2539,10 @@ static void svm_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked) 


	if (masked) {

		svm->vcpu.arch.hflags |= HF_NMI_MASK;

		svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);

		svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);

	} else {

		svm->vcpu.arch.hflags &= ~HF_NMI_MASK;

		svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);

		svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);

	}

}

arch/x86/kvm/vmx.c

+1 −2
Original line number Diff line number Diff line
@@ -2703,8 +2703,7 @@ static int vmx_nmi_allowed(struct kvm_vcpu *vcpu) 
		return 0;



	return	!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &

			(GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS |

				GUEST_INTR_STATE_NMI));

			(GUEST_INTR_STATE_MOV_SS | GUEST_INTR_STATE_NMI));

}



static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)

arch/x86/kvm/x86.c

+4 −0
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, 
	if (copy_from_user(cpuid_entries, entries,

			   cpuid->nent * sizeof(struct kvm_cpuid_entry)))

		goto out_free;

	vcpu_load(vcpu);

	for (i = 0; i < cpuid->nent; i++) {

		vcpu->arch.cpuid_entries[i].function = cpuid_entries[i].function;

		vcpu->arch.cpuid_entries[i].eax = cpuid_entries[i].eax;
@@ -1729,6 +1730,7 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, 
	r = 0;

	kvm_apic_set_version(vcpu);

	kvm_x86_ops->cpuid_update(vcpu);

	vcpu_put(vcpu);



out_free:

	vfree(cpuid_entries);
@@ -1749,9 +1751,11 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, 
	if (copy_from_user(&vcpu->arch.cpuid_entries, entries,

			   cpuid->nent * sizeof(struct kvm_cpuid_entry2)))

		goto out;

	vcpu_load(vcpu);

	vcpu->arch.cpuid_nent = cpuid->nent;

	kvm_apic_set_version(vcpu);

	kvm_x86_ops->cpuid_update(vcpu);

	vcpu_put(vcpu);

	return 0;



out:

drivers/char/tty_io.c

+1 −0
Original line number Diff line number Diff line
@@ -1875,6 +1875,7 @@ static int tty_open(struct inode *inode, struct file *filp) 
		 */

		if (filp->f_op == &hung_up_tty_fops)

			filp->f_op = &tty_fops;

		unlock_kernel();

		goto retry_open;

	}

	unlock_kernel();