diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-08-25 16:39:18 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-08-27 14:13:51 -0400 |
commit | a587d2daebcd2bc159d4348b6a7b028950a6d803 (patch) | |
tree | 8001158a76efe400600a4e54dc5dae384b32b6e5 /arch/x86/kernel | |
parent | a9ce6bc15100023b411f8117e53a016d61889800 (diff) |
x86: Remove not used early_res code
and some functions in e820.c that are not used anymore
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/e820.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index a9221d18a5ed..d5fd89462d79 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
@@ -739,32 +739,6 @@ core_initcall(e820_mark_nvs_memory); | |||
739 | #endif | 739 | #endif |
740 | 740 | ||
741 | /* | 741 | /* |
742 | * Find a free area with specified alignment in a specific range. | ||
743 | */ | ||
744 | u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align) | ||
745 | { | ||
746 | u64 mem = memblock_find_in_range(start, end, size, align); | ||
747 | |||
748 | if (mem == MEMBLOCK_ERROR) | ||
749 | return -1ULL; | ||
750 | |||
751 | return mem; | ||
752 | } | ||
753 | |||
754 | /* | ||
755 | * Find next free range after *start | ||
756 | */ | ||
757 | u64 __init find_e820_area_size(u64 start, u64 *sizep, u64 align) | ||
758 | { | ||
759 | u64 mem = memblock_x86_find_in_range_size(start, sizep, align); | ||
760 | |||
761 | if (mem == MEMBLOCK_ERROR) | ||
762 | return -1ULL | ||
763 | |||
764 | return mem; | ||
765 | } | ||
766 | |||
767 | /* | ||
768 | * pre allocated 4k and reserved it in memblock and e820_saved | 742 | * pre allocated 4k and reserved it in memblock and e820_saved |
769 | */ | 743 | */ |
770 | u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) | 744 | u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) |
@@ -856,32 +830,6 @@ unsigned long __init e820_end_of_low_ram_pfn(void) | |||
856 | return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM); | 830 | return e820_end_pfn(1UL<<(32 - PAGE_SHIFT), E820_RAM); |
857 | } | 831 | } |
858 | 832 | ||
859 | /* Walk the e820 map and register active regions within a node */ | ||
860 | void __init e820_register_active_regions(int nid, unsigned long start_pfn, | ||
861 | unsigned long last_pfn) | ||
862 | { | ||
863 | memblock_x86_register_active_regions(nid, start_pfn, last_pfn); | ||
864 | } | ||
865 | |||
866 | /* | ||
867 | * Find the hole size (in bytes) in the memory range. | ||
868 | * @start: starting address of the memory range to scan | ||
869 | * @end: ending address of the memory range to scan | ||
870 | */ | ||
871 | u64 __init e820_hole_size(u64 start, u64 end) | ||
872 | { | ||
873 | return memblock_x86_hole_size(start, end); | ||
874 | } | ||
875 | |||
876 | void reserve_early(u64 start, u64 end, char *name) | ||
877 | { | ||
878 | memblock_x86_reserve_range(start, end, name); | ||
879 | } | ||
880 | void free_early(u64 start, u64 end) | ||
881 | { | ||
882 | memblock_x86_free_range(start, end); | ||
883 | } | ||
884 | |||
885 | static void early_panic(char *msg) | 833 | static void early_panic(char *msg) |
886 | { | 834 | { |
887 | early_printk(msg); | 835 | early_printk(msg); |