diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-16 18:14:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-16 18:14:44 (GMT) |
| commit | ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b (patch) | |
| tree | 73c2ac345b631ee16ba07682c6c451fdce23b15f | |
| parent | 4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251 (diff) | |
| parent | df3d8ae1f8780166a16dd7d08b4842a4d5b5f2b4 (diff) | |
| download | linux-ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b.tar.xz | |
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
| -rw-r--r-- | arch/x86/kvm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 988724b..ff5790d 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 |