# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1197482010 25200
# Node ID 4344d531875bbf6d619894f9d93976210ed84806
# Parent 412fe6438399e5907a94b865e5354c6f80c29fcc
[IA64] Update build configs and fix xenU build
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
arch/ia64/mm/contig.c | 2 +-
buildconfigs/linux-defconfig_xen0_ia64 | 7 ++++---
buildconfigs/linux-defconfig_xenU_ia64 | 7 ++++---
buildconfigs/linux-defconfig_xen_ia64 | 7 ++++---
4 files changed, 13 insertions(+), 10 deletions(-)
diff -r 412fe6438399 -r 4344d531875b arch/ia64/mm/contig.c
--- a/arch/ia64/mm/contig.c Wed Dec 12 10:51:43 2007 -0700
+++ b/arch/ia64/mm/contig.c Wed Dec 12 10:53:30 2007 -0700
@@ -175,7 +175,7 @@ find_memory (void)
/* Free all available memory, then mark bootmem-map as being in use. */
efi_memmap_walk(filter_rsvd_memory, free_bootmem);
reserve_bootmem(bootmap_start, bootmap_size);
-#ifdef CONFIG_XEN
+#if defined(CONFIG_XEN) && defined(CONFIG_KEXEC)
xen_machine_kexec_setup_resources();
#endif
diff -r 412fe6438399 -r 4344d531875b buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64 Wed Dec 12 10:51:43 2007 -0700
+++ b/buildconfigs/linux-defconfig_xen0_ia64 Wed Dec 12 10:53:30 2007 -0700
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Mon Jul 30 11:37:09 2007
+# Linux kernel version: 2.6.18.8
+# Wed Dec 12 09:21:02 2007
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -1652,7 +1652,7 @@ CONFIG_CRYPTO_DES=y
#
# CONFIG_XEN_SMPBOOT is not set
# CONFIG_XEN_DEVMEM is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030205
+CONFIG_XEN_INTERFACE_VERSION=0x00030207
#
# XEN
@@ -1676,6 +1676,7 @@ CONFIG_XEN_TPMDEV_BACKEND=m
CONFIG_XEN_TPMDEV_BACKEND=m
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_GRANT_DEV=y
CONFIG_XEN_FRAMEBUFFER=y
CONFIG_XEN_KEYBOARD=y
# CONFIG_XEN_SCRUB_PAGES is not set
diff -r 412fe6438399 -r 4344d531875b buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64 Wed Dec 12 10:51:43 2007 -0700
+++ b/buildconfigs/linux-defconfig_xenU_ia64 Wed Dec 12 10:53:30 2007 -0700
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Mon Jul 30 11:39:02 2007
+# Linux kernel version: 2.6.18.8
+# Wed Dec 12 09:21:28 2007
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -1474,7 +1474,7 @@ CONFIG_CRYPTO_DES=y
#
# CONFIG_XEN_SMPBOOT is not set
# CONFIG_XEN_DEVMEM is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030205
+CONFIG_XEN_INTERFACE_VERSION=0x00030207
#
# XEN
@@ -1486,6 +1486,7 @@ CONFIG_XEN_XENBUS_DEV=y
# CONFIG_XEN_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
+# CONFIG_XEN_GRANT_DEV is not set
CONFIG_XEN_FRAMEBUFFER=y
CONFIG_XEN_KEYBOARD=y
# CONFIG_XEN_SCRUB_PAGES is not set
diff -r 412fe6438399 -r 4344d531875b buildconfigs/linux-defconfig_xen_ia64
--- a/buildconfigs/linux-defconfig_xen_ia64 Wed Dec 12 10:51:43 2007 -0700
+++ b/buildconfigs/linux-defconfig_xen_ia64 Wed Dec 12 10:53:30 2007 -0700
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Mon Jul 30 11:12:36 2007
+# Linux kernel version: 2.6.18.8
+# Wed Dec 12 09:06:57 2007
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -1652,7 +1652,7 @@ CONFIG_CRYPTO_DES=y
#
# CONFIG_XEN_SMPBOOT is not set
# CONFIG_XEN_DEVMEM is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030205
+CONFIG_XEN_INTERFACE_VERSION=0x00030207
#
# XEN
@@ -1676,6 +1676,7 @@ CONFIG_XEN_TPMDEV_BACKEND=m
CONFIG_XEN_TPMDEV_BACKEND=m
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_GRANT_DEV=y
CONFIG_XEN_FRAMEBUFFER=y
CONFIG_XEN_KEYBOARD=y
# CONFIG_XEN_SCRUB_PAGES is not set
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home