ia64/xen-unstable

changeset 3352:789b10e9b58b

bitkeeper revision 1.1159.1.516 (41d410d7eWGB0LUnCA0Y7EAIZig5Hg)

Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author smh22@tempest.cl.cam.ac.uk
date Thu Dec 30 14:29:43 2004 +0000 (2004-12-30)
parents cdbaaaab2ca8 1b41e54d74f6
children b7f02043001c
files BitKeeper/etc/ignore xen/arch/x86/e820.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Thu Dec 30 14:20:19 2004 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Thu Dec 30 14:29:43 2004 +0000
     1.3 @@ -7,6 +7,7 @@
     1.4  *.tar.bz2
     1.5  *.tar.gz
     1.6  *~
     1.7 +BLOG
     1.8  BitKeeper/*/*
     1.9  PENDING/*
    1.10  TAGS
    1.11 @@ -75,6 +76,7 @@ tools/web-shutdown.tap
    1.12  tools/x2d2/minixend
    1.13  tools/xentrace/xentrace
    1.14  tools/xfrd/xfrd
    1.15 +xen/BLOG
    1.16  xen/arch/x86/asm-offsets.s
    1.17  xen/arch/x86/boot/mkelf32
    1.18  xen/ddb/*
    1.19 @@ -91,5 +93,3 @@ xen/tools/figlet/figlet
    1.20  xen/xen
    1.21  xen/xen-syms
    1.22  xen/xen.*
    1.23 -xen/BLOG
    1.24 -BLOG
     2.1 --- a/xen/arch/x86/e820.c	Thu Dec 30 14:20:19 2004 +0000
     2.2 +++ b/xen/arch/x86/e820.c	Thu Dec 30 14:29:43 2004 +0000
     2.3 @@ -5,40 +5,6 @@
     2.4  
     2.5  struct e820map e820;
     2.6  
     2.7 -static void __init limit_regions(unsigned long long size)
     2.8 -{
     2.9 -    unsigned long long current_addr = 0;
    2.10 -    int i;
    2.11 -
    2.12 -#if 0
    2.13 -    if (efi_enabled) {
    2.14 -        for (i = 0; i < memmap.nr_map; i++) {
    2.15 -            current_addr = memmap.map[i].phys_addr +
    2.16 -                (memmap.map[i].num_pages << 12);
    2.17 -            if (memmap.map[i].type == EFI_CONVENTIONAL_MEMORY) {
    2.18 -                if (current_addr >= size) {
    2.19 -                    memmap.map[i].num_pages -=
    2.20 -                        (((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT);
    2.21 -                    memmap.nr_map = i + 1;
    2.22 -                    return;
    2.23 -                }
    2.24 -            }
    2.25 -        }
    2.26 -    }
    2.27 -#endif
    2.28 -
    2.29 -    for (i = 0; i < e820.nr_map; i++) {
    2.30 -        if (e820.map[i].type == E820_RAM) {
    2.31 -            current_addr = e820.map[i].addr + e820.map[i].size;
    2.32 -            if (current_addr >= size) {
    2.33 -                e820.map[i].size -= current_addr-size;
    2.34 -                e820.nr_map = i + 1;
    2.35 -                return;
    2.36 -            }
    2.37 -        }
    2.38 -    }
    2.39 -}
    2.40 -
    2.41  static void __init add_memory_region(unsigned long long start,
    2.42                                       unsigned long long size, int type)
    2.43  {