diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-07-27 16:57:48 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-07-27 21:07:17 -0400 |
| commit | 35ffdcd40ec0fe800421cd251f16a85be845c0e7 (patch) | |
| tree | 99b8252ba790f60a326b34c622d73ae8d3413a22 /config-x86_64-generic | |
| parent | 4a2041744e262bb41936adfb3db0b85e13c73b11 (diff) | |
| download | kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.gz kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.xz kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.zip | |
3.0-git9 snapshot
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 340d7472d..4b71af7a2 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -285,6 +285,7 @@ CONFIG_KVM_AMD=m CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_PARAVIRT_DEBUG is not set # PARAVIRT_SPINLOCKS has a 5% perf hit # CONFIG_PARAVIRT_SPINLOCKS is not set @@ -296,6 +297,7 @@ CONFIG_XEN=y # CONFIG_XEN_DEBUG is not set CONFIG_XEN_MAX_DOMAIN_MEMORY=32 CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_HVC_XEN=y @@ -453,8 +455,6 @@ CONFIG_PCH_PHUB=m CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_JUMP_LABEL=y - CONFIG_HP_ILO=m CONFIG_TRANSPARENT_HUGEPAGE=y |