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>

7 files changed, 86 insertions, 176 deletions

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index dc3c636d113e..bcc2b123dabf 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -22,7 +22,7 @@ obj-y			+= setup_$(BITS).o i8259_$(BITS).o setup.o
 obj-$(CONFIG_X86_32)    += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)    += sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)    += syscall_64.o vsyscall_64.o setup64.o
-obj-y                   += bootflag.o e820_$(BITS).o e820.o
+obj-y                   += bootflag.o e820.o
 obj-y                   += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
 obj-y                   += alternative.o i8253.o pci-nommu.o
 obj-$(CONFIG_X86_64)    += bugs_64.o
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 432c49178577..49477484a2fa 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1029,4 +1029,76 @@ void __init e820_reserve_resources(void)
         }
 }
 
+char *__init __attribute__((weak)) machine_specific_memory_setup(void)
+{
+        char *who = "BIOS-e820";
+        int new_nr;
+        /*
+         * 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) {
+#ifdef CONFIG_X86_64
+                early_panic("Cannot find a valid memory map");
+#else
+                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);
+#endif
+        }
+
+        /* In case someone cares... */
+        return who;
+}
+
+/* Overridden in paravirt.c if CONFIG_PARAVIRT */
+char * __init __attribute__((weak)) memory_setup(void)
+{
+        return machine_specific_memory_setup();
+}
+
+void __init setup_memory_map(void)
+{
+        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
+        e820_print_map(memory_setup());
+}
+
+#ifdef CONFIG_X86_64
+int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
+{
+        int i;
 
+        if (slot < 0 || slot >= e820.nr_map)
+                return -1;
+        for (i = slot; i < e820.nr_map; i++) {
+                if (e820.map[i].type != E820_RAM)
+                        continue;
+                break;
+        }
+        if (i == e820.nr_map || e820.map[i].addr > (max_pfn << PAGE_SHIFT))
+                return -1;
+        *addr = e820.map[i].addr;
+        *size = min_t(u64, e820.map[i].size + e820.map[i].addr,
+                max_pfn << PAGE_SHIFT) - *addr;
+        return i + 1;
+}
+#endif
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
deleted file mode 100644
index 1205ccf086d7..000000000000
--- a/arch/x86/kernel/e820_32.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <linux/string.h>
-#include <linux/kexec.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/pfn.h>
-#include <linux/uaccess.h>
-
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/e820.h>
-#include <asm/setup.h>
-
-/* Overridden in paravirt.c if CONFIG_PARAVIRT */
-char * __init __attribute__((weak)) memory_setup(void)
-{
-        return machine_specific_memory_setup();
-}
-
-void __init setup_memory_map(void)
-{
-        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
-        e820_print_map(memory_setup());
-}
-
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
deleted file mode 100644
index cb03bff9fa2f..000000000000
--- a/arch/x86/kernel/e820_64.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Handle the memory map.
- * The functions here do the job until bootmem takes over.
- *
- *  Getting sanitize_e820_map() in sync with i386 version by applying change:
- *  -  Provisions for empty E820 memory regions (reported by certain BIOSes).
- *     Alex Achenbach <xela@slit.de>, December 2002.
- *  Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
- *
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <linux/string.h>
-#include <linux/kexec.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/pfn.h>
-#include <linux/pci.h>
-
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/e820.h>
-#include <asm/proto.h>
-#include <asm/setup.h>
-#include <asm/sections.h>
-#include <asm/kdebug.h>
-#include <asm/trampoline.h>
-
-/*
- * PFN of last memory page.
- */
-unsigned long end_pfn;
-
-/*
- * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
- * The direct mapping extends to max_pfn_mapped, so that we can directly access
- * apertures, ACPI and other tables without having to play with fixmaps.
- */
-unsigned long max_pfn_mapped;
-
-static void early_panic(char *msg)
-{
-        early_printk(msg);
-        panic(msg);
-}
-
-/* We're not void only for x86 32-bit compat */
-char *__init machine_specific_memory_setup(void)
-{
-        char *who = "BIOS-e820";
-        int new_nr;
-        /*
-         * 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)
-                early_panic("Cannot find a valid memory map");
-        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
-        e820_print_map(who);
-
-        /* In case someone cares... */
-        return who;
-}
-
-int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
-{
-        int i;
-
-        if (slot < 0 || slot >= e820.nr_map)
-                return -1;
-        for (i = slot; i < e820.nr_map; i++) {
-                if (e820.map[i].type != E820_RAM)
-                        continue;
-                break;
-        }
-        if (i == e820.nr_map || e820.map[i].addr > (max_pfn << PAGE_SHIFT))
-                return -1;
-        *addr = e820.map[i].addr;
-        *size = min_t(u64, e820.map[i].size + e820.map[i].addr,
-                max_pfn << PAGE_SHIFT) - *addr;
-        return i + 1;
-}
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index ec65696ca2cd..3220c7b56eb3 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -266,12 +266,6 @@ static inline void __init reserve_crashkernel(void)
 {}
 #endif
 
-/* Overridden in paravirt.c if CONFIG_PARAVIRT */
-void __attribute__((weak)) __init memory_setup(void)
-{
-       machine_specific_memory_setup();
-}
-
 #ifdef CONFIG_PCI_MMCONFIG
 extern void __cpuinit fam10h_check_enable_mmcfg(void);
 extern void __init check_enable_amd_mmconf_dmi(void);
@@ -316,7 +310,7 @@ void __init setup_arch(char **cmdline_p)
 
         ARCH_SETUP
 
-        memory_setup();
+        setup_memory_map();
         copy_edd();
 
         if (!boot_params.hdr.root_flags)
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;
-}
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index b8c2c1ef7ad5..5266f3141d6c 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -47,6 +47,18 @@
 #include <asm/numa.h>
 #include <asm/cacheflush.h>
 
+/*
+ * PFN of last memory page.
+ */
+unsigned long end_pfn;
+
+/*
+ * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
+ * The direct mapping extends to max_pfn_mapped, so that we can directly access
+ * apertures, ACPI and other tables without having to play with fixmaps.
+ */
+unsigned long max_pfn_mapped;
+
 static unsigned long dma_reserve __initdata;
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);