From 35ffdcd40ec0fe800421cd251f16a85be845c0e7 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 27 Jul 2011 16:57:48 -0400 Subject: 3.0-git9 snapshot --- config-x86_64-generic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config-x86_64-generic') 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 -- cgit