diff options
Diffstat (limited to 'arch/x86/kernel/efi.c')
| -rw-r--r-- | arch/x86/kernel/efi.c | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c index c2fa9b8b497e..0fe27d7c6258 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> | 
| 31 | #include <linux/efi.h> | 31 | #include <linux/efi.h> | 
| 32 | #include <linux/bootmem.h> | 32 | #include <linux/bootmem.h> | 
| 33 | #include <linux/memblock.h> | ||
| 33 | #include <linux/spinlock.h> | 34 | #include <linux/spinlock.h> | 
| 34 | #include <linux/uaccess.h> | 35 | #include <linux/uaccess.h> | 
| 35 | #include <linux/time.h> | 36 | #include <linux/time.h> | 
| @@ -275,7 +276,7 @@ static void __init do_add_efi_memmap(void) | |||
| 275 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 276 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 
| 276 | } | 277 | } | 
| 277 | 278 | ||
| 278 | void __init efi_reserve_early(void) | 279 | void __init efi_memblock_x86_reserve_range(void) | 
| 279 | { | 280 | { | 
| 280 | unsigned long pmap; | 281 | unsigned long pmap; | 
| 281 | 282 | ||
| @@ -290,7 +291,7 @@ void __init efi_reserve_early(void) | |||
| 290 | boot_params.efi_info.efi_memdesc_size; | 291 | boot_params.efi_info.efi_memdesc_size; | 
| 291 | memmap.desc_version = boot_params.efi_info.efi_memdesc_version; | 292 | memmap.desc_version = boot_params.efi_info.efi_memdesc_version; | 
| 292 | memmap.desc_size = boot_params.efi_info.efi_memdesc_size; | 293 | memmap.desc_size = boot_params.efi_info.efi_memdesc_size; | 
| 293 | reserve_early(pmap, pmap + memmap.nr_map * memmap.desc_size, | 294 | memblock_x86_reserve_range(pmap, pmap + memmap.nr_map * memmap.desc_size, | 
| 294 | "EFI memmap"); | 295 | "EFI memmap"); | 
| 295 | } | 296 | } | 
| 296 | 297 | ||
