Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ce6bc1 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 72d7c3b3

arch/x86/include/asm/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, 
#endif /* CONFIG_X86_32 */



extern int add_efi_memmap;

extern void efi_reserve_early(void);

extern void efi_memblock_x86_reserve_range(void);

extern void efi_call_phys_prelog(void);

extern void efi_call_phys_epilog(void);

arch/x86/kernel/acpi/sleep.c

+5 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/acpi.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/dmi.h>

#include <linux/cpumask.h>

#include <asm/segment.h>
@@ -125,7 +126,7 @@ void acpi_restore_state_mem(void) 
 */

void __init acpi_reserve_wakeup_memory(void)

{

	unsigned long mem;

	phys_addr_t mem;



	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {

		printk(KERN_ERR
@@ -133,15 +134,15 @@ void __init acpi_reserve_wakeup_memory(void) 
		return;

	}



	mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);

	mem = memblock_find_in_range(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);



	if (mem == -1L) {

	if (mem == MEMBLOCK_ERROR) {

		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");

		return;

	}

	acpi_realmode = (unsigned long) phys_to_virt(mem);

	acpi_wakeup_address = mem;

	reserve_early(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");

	memblock_x86_reserve_range(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");

}

arch/x86/kernel/apic/numaq_32.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/nodemask.h>

#include <linux/topology.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/threads.h>

#include <linux/cpumask.h>

#include <linux/kernel.h>
@@ -88,7 +89,7 @@ static inline void numaq_register_node(int node, struct sys_cfg_data *scd) 
	node_end_pfn[node] =

		 MB_TO_PAGES(eq->hi_shrd_mem_start + eq->hi_shrd_mem_size);



	e820_register_active_regions(node, node_start_pfn[node],

	memblock_x86_register_active_regions(node, node_start_pfn[node],

						node_end_pfn[node]);



	memory_present(node, node_start_pfn[node], node_end_pfn[node]);

arch/x86/kernel/efi.c

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/init.h>

#include <linux/efi.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/spinlock.h>

#include <linux/uaccess.h>

#include <linux/time.h>
@@ -275,7 +276,7 @@ static void __init do_add_efi_memmap(void) 
	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

}



void __init efi_reserve_early(void)

void __init efi_memblock_x86_reserve_range(void)

{

	unsigned long pmap;
@@ -290,7 +291,7 @@ void __init efi_reserve_early(void) 
		boot_params.efi_info.efi_memdesc_size;

	memmap.desc_version = boot_params.efi_info.efi_memdesc_version;

	memmap.desc_size = boot_params.efi_info.efi_memdesc_size;

	reserve_early(pmap, pmap + memmap.nr_map * memmap.desc_size,

	memblock_x86_reserve_range(pmap, pmap + memmap.nr_map * memmap.desc_size,

		      "EFI memmap");

}

arch/x86/kernel/head32.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void __init i386_start_kernel(void) 
	memblock_x86_reserve_range(PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE");

#endif



	reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");

	memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");



#ifdef CONFIG_BLK_DEV_INITRD

	/* Reserve INITRD */
@@ -51,7 +51,7 @@ void __init i386_start_kernel(void) 
		u64 ramdisk_image = boot_params.hdr.ramdisk_image;

		u64 ramdisk_size  = boot_params.hdr.ramdisk_size;

		u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);

		reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");

		memblock_x86_reserve_range(ramdisk_image, ramdisk_end, "RAMDISK");

	}

#endif