[Xen-changelog] Fix 64-bit build.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID aeaa3c83f6e5359d71e920d8d60faeaae776c877
# Parent  d105692072a417a67f034b012a13af5c62b37432
Fix 64-bit build.

diff -r d105692072a4 -r aeaa3c83f6e5 
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c        Mon Sep  5 
19:53:44 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c        Mon Sep  5 
20:05:58 2005
@@ -20,6 +20,9 @@
 #include <asm/e820.h>
 #include <asm/proto.h>
 #include <asm/bootsetup.h>
+#include <asm-xen/xen-public/memory.h>
+
+unsigned long pci_mem_start = 0xaeedbabe;
 
 /* 
  * PFN of last memory page.
@@ -605,8 +608,6 @@
         xen_override_max_pfn = (unsigned long) end_user_pfn;
 } 
 
-unsigned long pci_mem_start = 0xaeedbabe;
-
 /*
  * Search for the biggest gap in the low 32 bits of the e820
  * memory space.  We pass this space to PCI to assign MMIO resources
diff -r d105692072a4 -r aeaa3c83f6e5 tools/xenstore/xenstored_core.c
--- a/tools/xenstore/xenstored_core.c   Mon Sep  5 19:53:44 2005
+++ b/tools/xenstore/xenstored_core.c   Mon Sep  5 20:05:58 2005
@@ -719,7 +719,7 @@
        char *slash = strrchr(node + 1, '/');
        if (!slash)
                return talloc_strdup(node, "/");
-       return talloc_asprintf(node, "%.*s", slash - node, node);
+       return talloc_asprintf(node, "%.*s", (int)(slash - node), node);
 }
 
 static enum xs_perm_type perm_for_id(domid_t id,
@@ -910,7 +910,7 @@
        if (slash)
                *slash = '\0';
 
-       dest = talloc_asprintf(dir, "%.*s", dot - dir, dir);
+       dest = talloc_asprintf(dir, "%.*s", (int)(dot - dir), dir);
        return rename(dir, dest) == 0;
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog