[kernel] r12051 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386

[Ian Campbell]

Author: ijc-guest
Date: Tue Aug 12 20:54:50 2008
New Revision: 12051

Log:
Enable Xen in amd64 kernel images.

Also explicitly list some Xen symbols in the i386 config which were
simply taken by default before, no actual change to the configuration.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Aug 12 20:54:50 2008
@@ -6,6 +6,9 @@
   [ Martin Michlmayr ]
   * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660.
 
+  [ Ian Campbell ]
+  * [x86]: Enable Xen guest support in amd64 flavour.
+
  -- maximilian attems <maks at debian.org>  Wed, 30 Jul 2008 18:23:09 +0200
 
 linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Tue Aug 12 20:54:50 2008
@@ -93,6 +93,13 @@
 CONFIG_KVM_AMD=m
 
 ##
+## file: arch/x86/xen/Kconfig
+##
+CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=32
+CONFIG_XEN_SAVE_RESTORE=y
+
+##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
@@ -176,6 +183,7 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 
 ##
@@ -242,6 +250,7 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
+CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
 CONFIG_RTC=y
 CONFIG_GEN_RTC=m
@@ -506,6 +515,7 @@
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
+CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -931,6 +941,7 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -1341,6 +1352,7 @@
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set
 CONFIG_FB_VIRTUAL=m
+CONFIG_XEN_FBDEV_FRONTEND=y
 
 ##
 ## file: drivers/video/backlight/Kconfig
@@ -1404,6 +1416,12 @@
 CONFIG_USBPCWATCHDOG=m
 
 ##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+
+##
 ## file: fs/partitions/Kconfig
 ##
 CONFIG_ACORN_PARTITION=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Tue Aug 12 20:54:50 2008
@@ -158,6 +158,8 @@
 ## file: arch/x86/xen/Kconfig
 ##
 CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_SAVE_RESTORE=y
 
 ##
 ## file: crypto/Kconfig
@@ -610,6 +612,7 @@
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
+CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -1667,6 +1670,12 @@
 CONFIG_BINFMT_AOUT=m
 
 ##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+
+##
 ## file: fs/partitions/Kconfig
 ##
 CONFIG_ACORN_PARTITION=y