Commit ab7e2dbf9b5da4d4eb4fdb019cc8881fbeb1299b
Exists in
master
and in
4 other branches
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
Showing 1 changed file Side-by-side Diff
arch/x86/kvm/Kconfig
| ... | ... | @@ -22,6 +22,8 @@ |
| 22 | 22 | depends on HAVE_KVM |
| 23 | 23 | # for device assignment: |
| 24 | 24 | depends on PCI |
| 25 | + # for TASKSTATS/TASK_DELAY_ACCT: | |
| 26 | + depends on NET | |
| 25 | 27 | select PREEMPT_NOTIFIERS |
| 26 | 28 | select MMU_NOTIFIER |
| 27 | 29 | select ANON_INODES |
| ... | ... | @@ -31,6 +33,7 @@ |
| 31 | 33 | select KVM_ASYNC_PF |
| 32 | 34 | select USER_RETURN_NOTIFIER |
| 33 | 35 | select KVM_MMIO |
| 36 | + select TASKSTATS | |
| 34 | 37 | select TASK_DELAY_ACCT |
| 35 | 38 | ---help--- |
| 36 | 39 | Support hosting fully virtualized guest machines using hardware |