x86, memblock: Replace e820_/_early string with memblock_

1.include linux/memblock.h directly. so later could reduce e820.h reference.
2 this patch is done by sed scripts mainly

-v2: use MEMBLOCK_ERROR instead of -1ULL or -1UL

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index fda01a2c31af..13b0caa9793c 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -436,7 +436,7 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
 {
 #ifdef CONFIG_NO_BOOTMEM
         kmemleak_free_part(__va(physaddr), size);
-        free_early(physaddr, physaddr + size);
+        memblock_x86_free_range(physaddr, physaddr + size);
 #else
         unsigned long start, end;
 
@@ -462,7 +462,7 @@ void __init free_bootmem(unsigned long addr, unsigned long size)
 {
 #ifdef CONFIG_NO_BOOTMEM
         kmemleak_free_part(__va(addr), size);
-        free_early(addr, addr + size);
+        memblock_x86_free_range(addr, addr + size);
 #else
         unsigned long start, end;