git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea...
[pandora-kernel.git]
/
arch
/
x86
/
kvm
/
Kconfig
diff --git
a/arch/x86/kvm/Kconfig
b/arch/x86/kvm/Kconfig
index
988724b
..
ff5790d
100644
(file)
--- 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
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
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 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
select TASK_DELAY_ACCT
---help---
Support hosting fully virtualized guest machines using hardware