diff --git a/debian/changelog b/debian/changelog index 4ff24349c..85f3d29cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,7 @@ linux-2.6 (2.6.26~rc9-1~experimental.1) UNRELEASED; urgency=low [ Ian Campbell ] * Readme.build updated on how to generate orig tarballs. * Forward port vmlinuz-target.patch. + * Enable save/restore and memory ballooning in Xen packages. [ Bastian Blank ] * [powerpc/powerpc-miboot] Disable. (closes: #481358) diff --git a/debian/config/featureset-xen/config b/debian/config/featureset-xen/config index c526c2e8f..8d7ac72df 100644 --- a/debian/config/featureset-xen/config +++ b/debian/config/featureset-xen/config @@ -5,7 +5,14 @@ CONFIG_HVC_XEN=y CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_VMI is not set -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_HIBERNATION is not set +# CONFIG_APM is not set # CONFIG_CPU_FREQ is not set # CONFIG_PCI is not set # CONFIG_ISA is not set diff --git a/debian/patches/features/xen-x86.patch b/debian/patches/features/all/xen/tip-x86.patch similarity index 100% rename from debian/patches/features/xen-x86.patch rename to debian/patches/features/all/xen/tip-x86.patch diff --git a/debian/patches/series/1~experimental.1-extra b/debian/patches/series/1~experimental.1-extra index daab646d0..ba2a1fd64 100644 --- a/debian/patches/series/1~experimental.1-extra +++ b/debian/patches/series/1~experimental.1-extra @@ -7,4 +7,4 @@ + features/all/xen/xenctrl-privcmd.patch featureset=xen + features/all/xen/xenctrl-xenbus.patch featureset=xen + features/all/xen/xenctrl-sys-hypervisor.patch featureset=xen -#+ features/xen-x86.patch featureset=xen ++ features/all/xen/tip-x86.patch featureset=xen