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

Commit 0bbea1ce authored by Taku Izumi's avatar Taku Izumi Committed by Matt Fleming
Browse files

x86/efi: Rename print_efi_memmap() to efi_print_memmap() 



This patch renames print_efi_memmap() to efi_print_memmap() and
make it global function so that we can invoke it outside of
arch/x86/platform/efi/efi.c

Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 9ac4d5ab

arch/x86/include/asm/efi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ extern void __init efi_set_executable(efi_memory_desc_t *md, bool executable); 
extern int __init efi_memblock_x86_reserve_range(void);

extern int __init efi_memblock_x86_reserve_range(void);

extern pgd_t * __init efi_call_phys_prolog(void);

extern pgd_t * __init efi_call_phys_prolog(void);

extern void __init efi_call_phys_epilog(pgd_t *save_pgd);

extern void __init efi_call_phys_epilog(pgd_t *save_pgd);

extern void __init efi_print_memmap(void);

extern void __init efi_unmap_memmap(void);

extern void __init efi_unmap_memmap(void);

extern void __init efi_memory_uc(u64 addr, unsigned long size);

extern void __init efi_memory_uc(u64 addr, unsigned long size);

extern void __init efi_map_region(efi_memory_desc_t *md);

extern void __init efi_map_region(efi_memory_desc_t *md);

arch/x86/platform/efi/efi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -222,7 +222,7 @@ int __init efi_memblock_x86_reserve_range(void) 
	return 0;

	return 0;

}

}





static void __init print_efi_memmap(void)

void __init efi_print_memmap(void)

{

{

#ifdef EFI_DEBUG

#ifdef EFI_DEBUG

	efi_memory_desc_t *md;

	efi_memory_desc_t *md;
@@ -524,7 +524,7 @@ void __init efi_init(void) 
		return;

		return;





	if (efi_enabled(EFI_DBG))

	if (efi_enabled(EFI_DBG))

		print_efi_memmap();

		efi_print_memmap();





	efi_esrt_init();

	efi_esrt_init();

}

}