diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-30 12:01:47 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-12-30 12:01:47 +0000 |
| commit | 3d866e058558d7a27a07f6ab21049d535d60d736 (patch) | |
| tree | 4c15cc41f3c68a8046e1c3fac41e2215f5066218 /xen/include/asm-x86/e820.h | |
| parent | a8406294509338a29a78255080b886fa0c0e8b00 (diff) | |
| download | xen-3d866e058558d7a27a07f6ab21049d535d60d736.tar.gz xen-3d866e058558d7a27a07f6ab21049d535d60d736.tar.bz2 xen-3d866e058558d7a27a07f6ab21049d535d60d736.zip | |
bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)
manual merge
Diffstat (limited to 'xen/include/asm-x86/e820.h')
| -rw-r--r-- | xen/include/asm-x86/e820.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 0767642570..6d1af01e07 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -5,10 +5,12 @@ #define E820MAX 32 -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 -#define E820_NVS 4 +#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 #ifndef __ASSEMBLY__ struct e820entry { |