ia64/xen-unstable

changeset 3346:a026414250bd

bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)

manual merge
author kaf24@scramble.cl.cam.ac.uk
date Thu Dec 30 12:01:47 2004 +0000 (2004-12-30)
parents b3b0139a17e0
children 3d7f4ed76300 fb96571465e9
files xen/arch/x86/setup.c xen/include/asm-x86/e820.h
line diff
     1.1 --- a/xen/arch/x86/setup.c	Thu Dec 30 11:57:24 2004 +0000
     1.2 +++ b/xen/arch/x86/setup.c	Thu Dec 30 12:01:47 2004 +0000
     1.3 @@ -513,7 +513,7 @@ void __init __start_xen(multiboot_info_t
     1.4              e820_raw[e820_raw_nr].size = 
     1.5                  ((u64)map->length_high << 32) | (u64)map->length_low;
     1.6              e820_raw[e820_raw_nr].type = 
     1.7 -                (map->type > E820_NVS) ? E820_RESERVED : map->type;
     1.8 +                (map->type > E820_SHARED_PAGE) ? E820_RESERVED : map->type;
     1.9              e820_raw_nr++;
    1.10              bytes += map->size + 4;
    1.11          }
     2.1 --- a/xen/include/asm-x86/e820.h	Thu Dec 30 11:57:24 2004 +0000
     2.2 +++ b/xen/include/asm-x86/e820.h	Thu Dec 30 12:01:47 2004 +0000
     2.3 @@ -5,10 +5,12 @@
     2.4  
     2.5  #define E820MAX	32
     2.6  
     2.7 -#define E820_RAM	1
     2.8 -#define E820_RESERVED	2
     2.9 -#define E820_ACPI	3
    2.10 -#define E820_NVS	4
    2.11 +#define E820_RAM          1
    2.12 +#define E820_RESERVED     2
    2.13 +#define E820_ACPI         3
    2.14 +#define E820_NVS          4
    2.15 +#define E820_IO          16
    2.16 +#define E820_SHARED_PAGE 17
    2.17  
    2.18  #ifndef __ASSEMBLY__
    2.19  struct e820entry {