# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1184405162 -3600
# Node ID 3052a8f07a182015796ec755fecf0cfe4af8eaed
# Parent a17f20a0fd197e4346891a9312776c1bc2423035
Remove unused function reserve_boot_memory() and alloc_boot_low_page().
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/x86_64/mm.c | 3 +--
xen/common/page_alloc.c | 38 --------------------------------------
xen/include/xen/mm.h | 3 ---
3 files changed, 1 insertion(+), 43 deletions(-)
diff -r a17f20a0fd19 -r 3052a8f07a18 xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c Sat Jul 14 08:19:17 2007 +0100
+++ b/xen/arch/x86/x86_64/mm.c Sat Jul 14 10:26:02 2007 +0100
@@ -64,8 +64,7 @@ void *alloc_xen_pagetable(void)
return page_to_virt(pg);
}
- /* Early pagetables must come from low 1GB of memory. */
- mfn = alloc_boot_low_pages(1, 1); /* 0x0 - 0x40000000 */
+ mfn = alloc_boot_pages(1, 1);
BUG_ON(mfn == 0);
return mfn_to_virt(mfn);
}
diff -r a17f20a0fd19 -r 3052a8f07a18 xen/common/page_alloc.c
--- a/xen/common/page_alloc.c Sat Jul 14 08:19:17 2007 +0100
+++ b/xen/common/page_alloc.c Sat Jul 14 10:26:02 2007 +0100
@@ -249,44 +249,6 @@ void __init init_boot_pages(paddr_t ps,
}
}
-int __init reserve_boot_pages(unsigned long first_pfn, unsigned long nr_pfns)
-{
- unsigned long i;
-
- for ( i = 0; i < nr_pfns; i++ )
- if ( allocated_in_map(first_pfn + i) )
- break;
-
- if ( i != nr_pfns )
- return 0;
-
- map_alloc(first_pfn, nr_pfns);
- return 1;
-}
-
-unsigned long __init alloc_boot_low_pages(
- unsigned long nr_pfns, unsigned long pfn_align)
-{
- unsigned long pg, i;
-
- /* Search forwards to obtain lowest available range. */
- for ( pg = first_valid_mfn & ~(pfn_align - 1);
- (pg + nr_pfns) <= max_page;
- pg = (pg + i + pfn_align) & ~(pfn_align - 1) )
- {
- for ( i = 0; i < nr_pfns; i++ )
- if ( allocated_in_map(pg+i) )
- break;
- if ( i == nr_pfns )
- {
- map_alloc(pg, nr_pfns);
- return pg;
- }
- }
-
- return 0;
-}
-
unsigned long __init alloc_boot_pages(
unsigned long nr_pfns, unsigned long pfn_align)
{
diff -r a17f20a0fd19 -r 3052a8f07a18 xen/include/xen/mm.h
--- a/xen/include/xen/mm.h Sat Jul 14 08:19:17 2007 +0100
+++ b/xen/include/xen/mm.h Sat Jul 14 10:26:02 2007 +0100
@@ -41,9 +41,6 @@ void init_boot_pages(paddr_t ps, paddr_t
void init_boot_pages(paddr_t ps, paddr_t pe);
unsigned long alloc_boot_pages(
unsigned long nr_pfns, unsigned long pfn_align);
-unsigned long alloc_boot_low_pages(
- unsigned long nr_pfns, unsigned long pfn_align);
-int reserve_boot_pages(unsigned long first_pfn, unsigned long nr_pfns);
void end_boot_allocator(void);
/* Xen suballocator. These functions are interrupt-safe. */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home