|
@@ -59,7 +59,7 @@ void __init efi_fake_memmap(void)
|
|
u64 start, end, m_start, m_end, m_attr;
|
|
u64 start, end, m_start, m_end, m_attr;
|
|
int new_nr_map = memmap.nr_map;
|
|
int new_nr_map = memmap.nr_map;
|
|
efi_memory_desc_t *md;
|
|
efi_memory_desc_t *md;
|
|
- u64 new_memmap_phy;
|
|
|
|
|
|
+ phys_addr_t new_memmap_phy;
|
|
void *new_memmap;
|
|
void *new_memmap;
|
|
void *old, *new;
|
|
void *old, *new;
|
|
int i;
|
|
int i;
|
|
@@ -183,7 +183,7 @@ void __init efi_fake_memmap(void)
|
|
/* swap into new EFI memmap */
|
|
/* swap into new EFI memmap */
|
|
efi_unmap_memmap();
|
|
efi_unmap_memmap();
|
|
memmap.map = new_memmap;
|
|
memmap.map = new_memmap;
|
|
- memmap.phys_map = (void *)new_memmap_phy;
|
|
|
|
|
|
+ memmap.phys_map = new_memmap_phy;
|
|
memmap.nr_map = new_nr_map;
|
|
memmap.nr_map = new_nr_map;
|
|
memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size;
|
|
memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size;
|
|
set_bit(EFI_MEMMAP, &efi.flags);
|
|
set_bit(EFI_MEMMAP, &efi.flags);
|