x86: e820 merge parsing of the mem=/memmap= boot parameters

since we now have 32-bit support for e820_register_active_regions(),
we can merge the parsing of the mem=/memmap= boot parameters.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 69 deletions

diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 0afee2ca0bf8..47952b1690b6 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -96,75 +96,6 @@ char *__init machine_specific_memory_setup(void)
         return who;
 }
 
-static int __init parse_memopt(char *p)
-{
-        if (!p)
-                return -EINVAL;
-        end_user_pfn = memparse(p, &p);
-        end_user_pfn >>= PAGE_SHIFT;
-        return 0;
-}
-early_param("mem", parse_memopt);
-
-static int userdef __initdata;
-
-static int __init parse_memmap_opt(char *p)
-{
-        char *oldp;
-        unsigned long long start_at, mem_size;
-
-        if (!strcmp(p, "exactmap")) {
-#ifdef CONFIG_CRASH_DUMP
-                /*
-                 * If we are doing a crash dump, we still need to know
-                 * the real mem size before original memory map is
-                 * reset.
-                 */
-                e820_register_active_regions(0, 0, -1UL);
-                saved_max_pfn = e820_end_of_ram();
-                remove_all_active_ranges();
-#endif
-                e820.nr_map = 0;
-                userdef = 1;
-                return 0;
-        }
-
-        oldp = p;
-        mem_size = memparse(p, &p);
-        if (p == oldp)
-                return -EINVAL;
-
-        userdef = 1;
-        if (*p == '@') {
-                start_at = memparse(p+1, &p);
-                add_memory_region(start_at, mem_size, E820_RAM);
-        } else if (*p == '#') {
-                start_at = memparse(p+1, &p);
-                add_memory_region(start_at, mem_size, E820_ACPI);
-        } else if (*p == '$') {
-                start_at = memparse(p+1, &p);
-                add_memory_region(start_at, mem_size, E820_RESERVED);
-        } else {
-                end_user_pfn = (mem_size >> PAGE_SHIFT);
-        }
-        return *p == '\0' ? 0 : -EINVAL;
-}
-early_param("memmap", parse_memmap_opt);
-
-void __init finish_e820_parsing(void)
-{
-        if (userdef) {
-                int nr = e820.nr_map;
-
-                if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr) < 0)
-                        early_panic("Invalid user supplied memory map");
-                e820.nr_map = nr;
-
-                printk(KERN_INFO "user-defined physical RAM map:\n");
-                e820_print_map("user");
-        }
-}
-
 int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
 {
         int i;