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

Commit f155b630 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'efi-urgent' of...

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi

 into x86/urgent

Pull EFI fix from Matt Fleming:

 * The size of memory that gets freed by free_pages() needs to be
   specified in pages, not bytes - by Roy Franz.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents eaa5a990 df981edc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static void low_free(unsigned long size, unsigned long addr)
	unsigned long nr_pages;

	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
	efi_call_phys2(sys_table->boottime->free_pages, addr, size);
	efi_call_phys2(sys_table->boottime->free_pages, addr, nr_pages);
}

static void find_bits(unsigned long mask, u8 *pos, u8 *size)