From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Tue, 5 Jan 2010 19:03:21 +0000 (-0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=021b08da8f09226e9c45b256a039b3a8622eb4a9;p=users%2Fdwmw2%2Flinux.git

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

Conflicts:
	virt/kvm/assigned-dev.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

021b08da8f09226e9c45b256a039b3a8622eb4a9
diff --cc virt/kvm/kvm_main.c
index a5077df4a9fd7,a944be392d6e9..e0a591df6a7d0
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -440,12 -406,12 +440,15 @@@ static struct kvm *kvm_create_vm(void
  out:
  	return kvm;
  
+ #if defined(KVM_COALESCED_MMIO_PAGE_OFFSET) || \
+     (defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER))
  out_err:
  	hardware_disable_all();
+ #endif
  out_err_nodisable:
 +	for (i = 0; i < KVM_NR_BUSES; i++)
 +		kfree(kvm->buses[i]);
 +	kfree(kvm->memslots);
  	kfree(kvm);
  	return ERR_PTR(r);
  }