aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-16 11:14:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-16 11:14:44 -0700
commitab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b (patch)
tree73c2ac345b631ee16ba07682c6c451fdce23b15f /arch/x86
parent4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251 (diff)
parentdf3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4 (diff)
downloadautogen-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.tar.gz
autogen-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.tar.xz
autogen-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.zip
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
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 988724b236b..ff5790d8e99 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -22,6 +22,8 @@ config KVM
depends on HAVE_KVM
# for device assignment:
depends on PCI
+ # for TASKSTATS/TASK_DELAY_ACCT:
+ depends on NET
select PREEMPT_NOTIFIERS
select MMU_NOTIFIER
select ANON_INODES
@@ -31,6 +33,7 @@ config KVM
select KVM_ASYNC_PF
select USER_RETURN_NOTIFIER
select KVM_MMIO
+ select TASKSTATS
select TASK_DELAY_ACCT
---help---
Support hosting fully virtualized guest machines using hardware