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

Commit ab7e2dbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: uses TASKSTATS, depends on NET
  KVM: fix TASK_DELAY_ACCT kconfig warning
parents 4bc9b079 df3d8ae1

arch/x86/kvm/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ config KVM 
	depends on HAVE_KVM

	depends on HAVE_KVM

	# for device assignment:

	# for device assignment:

	depends on PCI

	depends on PCI

	# for TASKSTATS/TASK_DELAY_ACCT:

	depends on NET

	select PREEMPT_NOTIFIERS

	select PREEMPT_NOTIFIERS

	select MMU_NOTIFIER

	select MMU_NOTIFIER

	select ANON_INODES

	select ANON_INODES
@@ -31,6 +33,7 @@ config KVM 
	select KVM_ASYNC_PF

	select KVM_ASYNC_PF

	select USER_RETURN_NOTIFIER

	select USER_RETURN_NOTIFIER

	select KVM_MMIO

	select KVM_MMIO

	select TASKSTATS

	select TASK_DELAY_ACCT

	select TASK_DELAY_ACCT

	---help---

	---help---

	  Support hosting fully virtualized guest machines using hardware

	  Support hosting fully virtualized guest machines using hardware