[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 ed3957643e74ff011cb869ead16eed7c7f0cd73f..8522422db9effc7a764c2ea3ad44f4f6681e87d5 100644 (file)
--- 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 b17f551fad9624cf4024df146d72e63a52c94c37..666cc290475077a44ec2e750cde06b885271d37c 100644 (file)
--- 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 3ccbf94979079bcd12786ba07e4192ec1dce68b4..9918eecf9f8c4b837ce62766e3397c83b94b7a3d 100644 (file)
--- 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 291d183f4ee73d4a0b4be54d5cfa9b03bde924fb..dc993e5b8eaca0fc3e1acb06329462512340205f 100644 (file)
--- 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