diff options
author | Tejun Heo <tj@kernel.org> | 2011-07-12 05:15:58 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 14:47:47 -0400 |
commit | ab5d140b9eafae402aa3e673a63c5ef6164a9dd2 (patch) | |
tree | 499d3be0c75ef1f5f8922eae5c2a6428246e9b32 /arch/x86/kernel/mpparse.c | |
parent | 0608f70c78a384c2f225f2de226ca057a196f108 (diff) |
x86: Use __memblock_alloc_base() in early_reserve_e820()
early_reserve_e820() implements its own ad-hoc early allocator using
memblock_x86_find_in_range_size(). Use __memblock_alloc_base()
instead and remove the unnecessary @startt parameter (it's top-down
allocation anyway).
Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310462166-31469-6-git-send-email-tj@kernel.org
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 9103b89c145a..8faeaa0ed2cc 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -836,10 +836,8 @@ early_param("alloc_mptable", parse_alloc_mptable_opt); | |||
836 | 836 | ||
837 | void __init early_reserve_e820_mpc_new(void) | 837 | void __init early_reserve_e820_mpc_new(void) |
838 | { | 838 | { |
839 | if (enable_update_mptable && alloc_mptable) { | 839 | if (enable_update_mptable && alloc_mptable) |
840 | u64 startt = 0; | 840 | mpc_new_phys = early_reserve_e820(mpc_new_length, 4); |
841 | mpc_new_phys = early_reserve_e820(startt, mpc_new_length, 4); | ||
842 | } | ||
843 | } | 841 | } |
844 | 842 | ||
845 | static int __init update_mp_table(void) | 843 | static int __init update_mp_table(void) |