diff options
author | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-08-13 17:47:59 +0100 |
---|---|---|
committer | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-08-13 17:47:59 +0100 |
commit | 848ded1e096d01c634924b5c8306fa5143de8293 (patch) | |
tree | 2ce32611896fcf989e322f4a85b406ca9abca7c2 /xen/include/asm-x86/e820.h | |
parent | c730da041b1e73dc3e430e37a4e19ac446e74fd2 (diff) | |
download | xen-848ded1e096d01c634924b5c8306fa5143de8293.tar.gz xen-848ded1e096d01c634924b5c8306fa5143de8293.tar.bz2 xen-848ded1e096d01c634924b5c8306fa5143de8293.zip |
[XEN] Clean up e820 definitions. Define shared set in hvm public dir.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/asm-x86/e820.h')
-rw-r--r-- | xen/include/asm-x86/e820.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 8053fbd790..7730ce4a4e 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -1,30 +1,10 @@ #ifndef __E820_HEADER #define __E820_HEADER -#include <asm/page.h> +#include <public/hvm/e820.h> #define E820MAX 128 -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 -#define E820_NVS 4 -#define E820_IO 16 -#define E820_SHARED_PAGE 17 -#define E820_XENSTORE 18 -#define E820_BUFFERED_IO 19 - -#define E820_MAP_PAGE 0x00090000 -#define E820_MAP_NR_OFFSET 0x000001E8 -#define E820_MAP_OFFSET 0x000002D0 - -#ifndef __ASSEMBLY__ -struct e820entry { - u64 addr; - u64 size; - u32 type; -} __attribute__((packed)); - struct e820map { int nr_map; struct e820entry map[E820MAX]; @@ -33,13 +13,4 @@ struct e820map { extern unsigned long init_e820(struct e820entry *, int *); extern struct e820map e820; -#ifndef NDEBUG -extern void print_e820_memory_map(struct e820entry *map, int entries); -#endif - -#endif /*!__ASSEMBLY__*/ - -#define PFN_DOWN(x) ((x) >> PAGE_SHIFT) -#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) - #endif /*__E820_HEADER*/ |