ia64/xen-unstable

changeset 15600:3052a8f07a18

Remove unused function reserve_boot_memory() and alloc_boot_low_page().
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Sat Jul 14 10:26:02 2007 +0100 (2007-07-14)
parents a17f20a0fd19
children a0f90312844d
files xen/arch/x86/x86_64/mm.c xen/common/page_alloc.c xen/include/xen/mm.h
line diff
     1.1 --- a/xen/arch/x86/x86_64/mm.c	Sat Jul 14 08:19:17 2007 +0100
     1.2 +++ b/xen/arch/x86/x86_64/mm.c	Sat Jul 14 10:26:02 2007 +0100
     1.3 @@ -64,8 +64,7 @@ void *alloc_xen_pagetable(void)
     1.4          return page_to_virt(pg);
     1.5      }
     1.6  
     1.7 -    /* Early pagetables must come from low 1GB of memory. */
     1.8 -    mfn = alloc_boot_low_pages(1, 1); /* 0x0 - 0x40000000 */
     1.9 +    mfn = alloc_boot_pages(1, 1);
    1.10      BUG_ON(mfn == 0);
    1.11      return mfn_to_virt(mfn);
    1.12  }
     2.1 --- a/xen/common/page_alloc.c	Sat Jul 14 08:19:17 2007 +0100
     2.2 +++ b/xen/common/page_alloc.c	Sat Jul 14 10:26:02 2007 +0100
     2.3 @@ -249,44 +249,6 @@ void __init init_boot_pages(paddr_t ps, 
     2.4      }
     2.5  }
     2.6  
     2.7 -int __init reserve_boot_pages(unsigned long first_pfn, unsigned long nr_pfns)
     2.8 -{
     2.9 -    unsigned long i;
    2.10 -
    2.11 -    for ( i = 0; i < nr_pfns; i++ )
    2.12 -        if ( allocated_in_map(first_pfn + i) )
    2.13 -             break;
    2.14 -
    2.15 -    if ( i != nr_pfns )
    2.16 -        return 0;
    2.17 -
    2.18 -    map_alloc(first_pfn, nr_pfns);
    2.19 -    return 1;
    2.20 -}
    2.21 -
    2.22 -unsigned long __init alloc_boot_low_pages(
    2.23 -    unsigned long nr_pfns, unsigned long pfn_align)
    2.24 -{
    2.25 -    unsigned long pg, i;
    2.26 -
    2.27 -    /* Search forwards to obtain lowest available range. */
    2.28 -    for ( pg = first_valid_mfn & ~(pfn_align - 1);
    2.29 -          (pg + nr_pfns) <= max_page;
    2.30 -          pg = (pg + i + pfn_align) & ~(pfn_align - 1) )
    2.31 -    {
    2.32 -        for ( i = 0; i < nr_pfns; i++ )
    2.33 -            if ( allocated_in_map(pg+i) )
    2.34 -                break;
    2.35 -        if ( i == nr_pfns )
    2.36 -        {
    2.37 -            map_alloc(pg, nr_pfns);
    2.38 -            return pg;
    2.39 -        }
    2.40 -    }
    2.41 -
    2.42 -    return 0;
    2.43 -}
    2.44 -
    2.45  unsigned long __init alloc_boot_pages(
    2.46      unsigned long nr_pfns, unsigned long pfn_align)
    2.47  {
     3.1 --- a/xen/include/xen/mm.h	Sat Jul 14 08:19:17 2007 +0100
     3.2 +++ b/xen/include/xen/mm.h	Sat Jul 14 10:26:02 2007 +0100
     3.3 @@ -41,9 +41,6 @@ paddr_t init_boot_allocator(paddr_t bitm
     3.4  void init_boot_pages(paddr_t ps, paddr_t pe);
     3.5  unsigned long alloc_boot_pages(
     3.6      unsigned long nr_pfns, unsigned long pfn_align);
     3.7 -unsigned long alloc_boot_low_pages(
     3.8 -    unsigned long nr_pfns, unsigned long pfn_align);
     3.9 -int reserve_boot_pages(unsigned long first_pfn, unsigned long nr_pfns);
    3.10  void end_boot_allocator(void);
    3.11  
    3.12  /* Xen suballocator. These functions are interrupt-safe. */