ia64/xen-unstable

changeset 6650:aeaa3c83f6e5

Fix 64-bit build.
author kaf24@firebug.cl.cam.ac.uk
date Mon Sep 05 20:05:58 2005 +0000 (2005-09-05)
parents d105692072a4
children 60bf463f79a8 275e28658c66
files linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c tools/xenstore/xenstored_core.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c	Mon Sep 05 19:53:44 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c	Mon Sep 05 20:05:58 2005 +0000
     1.3 @@ -20,6 +20,9 @@
     1.4  #include <asm/e820.h>
     1.5  #include <asm/proto.h>
     1.6  #include <asm/bootsetup.h>
     1.7 +#include <asm-xen/xen-public/memory.h>
     1.8 +
     1.9 +unsigned long pci_mem_start = 0xaeedbabe;
    1.10  
    1.11  /* 
    1.12   * PFN of last memory page.
    1.13 @@ -605,8 +608,6 @@ void __init parse_memopt(char *p, char *
    1.14          xen_override_max_pfn = (unsigned long) end_user_pfn;
    1.15  } 
    1.16  
    1.17 -unsigned long pci_mem_start = 0xaeedbabe;
    1.18 -
    1.19  /*
    1.20   * Search for the biggest gap in the low 32 bits of the e820
    1.21   * memory space.  We pass this space to PCI to assign MMIO resources
     2.1 --- a/tools/xenstore/xenstored_core.c	Mon Sep 05 19:53:44 2005 +0000
     2.2 +++ b/tools/xenstore/xenstored_core.c	Mon Sep 05 20:05:58 2005 +0000
     2.3 @@ -719,7 +719,7 @@ static char *get_parent(const char *node
     2.4  	char *slash = strrchr(node + 1, '/');
     2.5  	if (!slash)
     2.6  		return talloc_strdup(node, "/");
     2.7 -	return talloc_asprintf(node, "%.*s", slash - node, node);
     2.8 +	return talloc_asprintf(node, "%.*s", (int)(slash - node), node);
     2.9  }
    2.10  
    2.11  static enum xs_perm_type perm_for_id(domid_t id,
    2.12 @@ -910,7 +910,7 @@ static bool commit_dir(char *dir)
    2.13  	if (slash)
    2.14  		*slash = '\0';
    2.15  
    2.16 -	dest = talloc_asprintf(dir, "%.*s", dot - dir, dir);
    2.17 +	dest = talloc_asprintf(dir, "%.*s", (int)(dot - dir), dir);
    2.18  	return rename(dir, dest) == 0;
    2.19  }
    2.20