From: Keir Fraser Date: Mon, 18 Apr 2011 17:08:47 +0000 (+0100) Subject: hvmloader: Fix _start-relative calculation of hypercall page address. X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=65d3e7529cf41f78de777fdcc30de7a32ea9e906;p=xen.git hvmloader: Fix _start-relative calculation of hypercall page address. We got away with it because _start-HYPERCALL_PHYSICAL_ADDRESS happens to equal HYPERCALL_PHYSICAL_ADDRESS. Signed-off-by: Keir Fraser --- diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 510c017075..296d500af0 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -63,10 +63,11 @@ extern unsigned long pci_mem_start, pci_mem_end; #define RESERVED_MEMBASE 0xfc000000 #define RESERVED_MEMSIZE 0x01000000 +/* Memory map. */ #define SCRATCH_PHYSICAL_ADDRESS 0x00010000 #define HYPERCALL_PHYSICAL_ADDRESS 0x00080000 - #define VGABIOS_PHYSICAL_ADDRESS 0x000C0000 +#define HVMLOADER_PHYSICAL_ADDRESS 0x00100000 #endif /* __HVMLOADER_CONFIG_H__ */ diff --git a/tools/firmware/hvmloader/hypercall.h b/tools/firmware/hvmloader/hypercall.h index 2df7247359..2de0d828e1 100644 --- a/tools/firmware/hvmloader/hypercall.h +++ b/tools/firmware/hvmloader/hypercall.h @@ -39,7 +39,8 @@ * NB. Hypercall address needs to be relative to a linkage symbol for * some version of ld to relocate the relative calls properly. */ -#define hypercall_pa "_start - " STR(HYPERCALL_PHYSICAL_ADDRESS) +#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \ + " + " STR(HYPERCALL_PHYSICAL_ADDRESS) #define _hypercall0(type, name) \ ({ \