[kernel] r11821 - in dists/trunk/linux-2.6/debian: . config/featureset-xen patches/features patches/features/all/xen patches/series

[Ian Campbell]

Author: ijc-guest
Date: Sun Jul 13 07:30:32 2008
New Revision: 11821

Log:
Enable save/restore and memory ballooning in Xen packages.

Move debian/patches/features/xen-x86.patch to
debian/patches/features/all/xen/tip-x86.patch near other Xen patches.


Added:
   dists/trunk/linux-2.6/debian/patches/features/all/xen/tip-x86.patch   (props changed)
      - copied unchanged from r11816, /dists/trunk/linux-2.6/debian/patches/features/xen-x86.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/features/xen-x86.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/featureset-xen/config
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jul 13 07:30:32 2008
@@ -100,6 +100,7 @@
   [ 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)

Modified: dists/trunk/linux-2.6/debian/config/featureset-xen/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-xen/config	(original)
+++ dists/trunk/linux-2.6/debian/config/featureset-xen/config	Sun Jul 13 07:30:32 2008
@@ -5,7 +5,14 @@
 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

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Sun Jul 13 07:30:32 2008
@@ -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