From: Alex Williamson <alex.williamson@hp.com>
Date: Wed, 12 Dec 2007 17:53:30 +0000 (-0700)
Subject: [IA64] Update build configs and fix xenU build
X-Git-Tag: xen-3.2.0~48
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=295fb36feb1f907591bdce23ad02af808f14cad8;p=legacy%2Flinux-2.6.18-xen.git

[IA64] Update build configs and fix xenU build

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index ed395764..8522422d 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -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 --git a/buildconfigs/linux-defconfig_xen0_ia64 b/buildconfigs/linux-defconfig_xen0_ia64
index b17f551f..666cc290 100644
--- a/buildconfigs/linux-defconfig_xen0_ia64
+++ b/buildconfigs/linux-defconfig_xen0_ia64
@@ -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_PCIDEV_BACKEND_CONTROLLER=y
 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 --git a/buildconfigs/linux-defconfig_xenU_ia64 b/buildconfigs/linux-defconfig_xenU_ia64
index 3ccbf949..9918eecf 100644
--- a/buildconfigs/linux-defconfig_xenU_ia64
+++ b/buildconfigs/linux-defconfig_xenU_ia64
@@ -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 --git a/buildconfigs/linux-defconfig_xen_ia64 b/buildconfigs/linux-defconfig_xen_ia64
index 291d183f..dc993e5b 100644
--- a/buildconfigs/linux-defconfig_xen_ia64
+++ b/buildconfigs/linux-defconfig_xen_ia64
@@ -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_PCIDEV_BACKEND_CONTROLLER=y
 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