[PATCH] x86: move some function out of setup_bootmem_alloc

From: Yinghai Lu
Date: Tue Jun 17 2008 - 13:02:07 EST



so make it more like 64 bit

Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>

--- a/arch/x86/kernel/setup_32.c 2008-06-17 00:22:29.000000000 -0700
+++ b/arch/x86/kernel/setup_32.c 2008-06-17 00:25:42.000000000 -0700
@@ -624,21 +624,6 @@ void __init setup_bootmem_allocator(void
free_bootmem_with_active_regions(i, max_low_pfn);
early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);

-#ifdef CONFIG_ACPI_SLEEP
- /*
- * Reserve low memory region for sleep support.
- */
- acpi_reserve_bootmem();
-#endif
-#ifdef CONFIG_X86_FIND_SMP_CONFIG
- /*
- * Find and reserve possible boot-time SMP configuration:
- */
- find_smp_config();
-#endif
- reserve_crashkernel();
-
- reserve_ibft_region();
}

/*
@@ -804,6 +789,22 @@ void __init setup_arch(char **cmdline_p)

max_low_pfn = setup_memory();

+#ifdef CONFIG_ACPI_SLEEP
+ /*
+ * Reserve low memory region for sleep support.
+ */
+ acpi_reserve_bootmem();
+#endif
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
+ /*
+ * Find and reserve possible boot-time SMP configuration:
+ */
+ find_smp_config();
+#endif
+ reserve_crashkernel();
+
+ reserve_ibft_region();
+
#ifdef CONFIG_KVM_CLOCK
kvmclock_init();
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/