x86: merge setup_memory_map with e820

... and kill e820_32/64.c and e820_32/64.h

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

1 files changed, 0 insertions, 47 deletions

diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 7ae692a76769..2f5e277686b8 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -142,50 +142,3 @@ static int __init print_ipi_mode(void)
 
 late_initcall(print_ipi_mode);
 
-/**
- * machine_specific_memory_setup - Hook for machine specific memory setup.
- *
- * Description:
- *      This is included late in kernel/setup.c so that it can make
- *      use of all of the static functions.
- **/
-
-char * __init machine_specific_memory_setup(void)
-{
-        char *who;
-        int new_nr;
-
-
-        who = "BIOS-e820";
-
-        /*
-         * Try to copy the BIOS-supplied E820-map.
-         *
-         * Otherwise fake a memory map; one section from 0k->640k,
-         * the next section from 1mb->appropriate_mem_k
-         */
-        new_nr = boot_params.e820_entries;
-        sanitize_e820_map(boot_params.e820_map,
-                        ARRAY_SIZE(boot_params.e820_map),
-                        &new_nr);
-        boot_params.e820_entries = new_nr;
-        if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
-            < 0) {
-                unsigned long mem_size;
-
-                /* compare results from other methods and take the greater */
-                if (boot_params.alt_mem_k
-                    < boot_params.screen_info.ext_mem_k) {
-                        mem_size = boot_params.screen_info.ext_mem_k;
-                        who = "BIOS-88";
-                } else {
-                        mem_size = boot_params.alt_mem_k;
-                        who = "BIOS-e801";
-                }
-
-                e820.nr_map = 0;
-                e820_add_region(0, LOWMEMSIZE(), E820_RAM);
-                e820_add_region(HIGH_MEMORY, mem_size << 10, E820_RAM);
-        }
-        return who;
-}