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

Commit 422b42fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Prevent kvm_init from corrupting debugfs structures
  KVM: MMU: fix pointer cast
  KVM: use proper hrtimer function to retrieve expiration time
parents 1b760703 0ea4ed8e

arch/x86/kvm/i8254.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static s64 __kpit_elapsed(struct kvm *kvm) 
	 * itself with the initial count and continues counting

	 * from there.

	 */

	remaining = hrtimer_expires_remaining(&ps->pit_timer.timer);

	remaining = hrtimer_get_remaining(&ps->pit_timer.timer);

	elapsed = ps->pit_timer.period - ktime_to_ns(remaining);

	elapsed = mod_64(elapsed, ps->pit_timer.period);

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic) 
	if (apic_get_reg(apic, APIC_TMICT) == 0)

		return 0;



	remaining = hrtimer_expires_remaining(&apic->lapic_timer.timer);

	remaining = hrtimer_get_remaining(&apic->lapic_timer.timer);

	if (ktime_to_ns(remaining) < 0)

		remaining = ktime_set(0, 0);

arch/x86/kvm/mmu.c

+10 −6
Original line number Diff line number Diff line
@@ -748,7 +748,8 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn) 
	return write_protected;

}



static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,

			   unsigned long data)

{

	u64 *spte;

	int need_tlb_flush = 0;
@@ -763,7 +764,8 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) 
	return need_tlb_flush;

}



static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,

			     unsigned long data)

{

	int need_flush = 0;

	u64 *spte, new_spte;
@@ -799,9 +801,10 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) 
	return 0;

}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, u64 data,

static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

			  unsigned long data,

			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,

					 u64 data))

					 unsigned long data))

{

	int i, j;

	int retval = 0;
@@ -846,10 +849,11 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) 


void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)

{

	kvm_handle_hva(kvm, hva, (u64)&pte, kvm_set_pte_rmapp);

	kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp);

}



static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,

			 unsigned long data)

{

	u64 *spte;

	int young = 0;

virt/kvm/kvm_main.c

+3 −4
Original line number Diff line number Diff line
@@ -2717,8 +2717,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
	int r;

	int cpu;



	kvm_init_debug();



	r = kvm_arch_init(opaque);

	if (r)

		goto out_fail;
@@ -2785,6 +2783,8 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
	kvm_preempt_ops.sched_in = kvm_sched_in;

	kvm_preempt_ops.sched_out = kvm_sched_out;



	kvm_init_debug();



	return 0;



out_free:
@@ -2807,7 +2807,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
out:

	kvm_arch_exit();

out_fail:

	kvm_exit_debug();

	return r;

}

EXPORT_SYMBOL_GPL(kvm_init);
@@ -2815,6 +2814,7 @@ EXPORT_SYMBOL_GPL(kvm_init); 
void kvm_exit(void)

{

	tracepoint_synchronize_unregister();

	kvm_exit_debug();

	misc_deregister(&kvm_dev);

	kmem_cache_destroy(kvm_vcpu_cache);

	sysdev_unregister(&kvm_sysdev);
@@ -2824,7 +2824,6 @@ void kvm_exit(void) 
	on_each_cpu(hardware_disable, NULL, 1);

	kvm_arch_hardware_unsetup();

	kvm_arch_exit();

	kvm_exit_debug();

	free_cpumask_var(cpus_hardware_enabled);

	__free_page(bad_page);

}