diff options
| author | Ingo Molnar | 2013-07-30 20:50:33 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-07-30 20:50:33 +0200 |
| commit | f155b6303d938462aaa31a8c7d409f3ea9012713 (patch) | |
| tree | 1a927f9e20585f8edabb8369951add97bdaacd3e /arch | |
| parent | x86, fpu: correct the asm constraints for fxsave, unbreak mxcsr.daz (diff) | |
| parent | x86, efi: correct call to free_pages (diff) | |
| download | kernel-qcow2-linux-f155b6303d938462aaa31a8c7d409f3ea9012713.tar.gz kernel-qcow2-linux-f155b6303d938462aaa31a8c7d409f3ea9012713.tar.xz kernel-qcow2-linux-f155b6303d938462aaa31a8c7d409f3ea9012713.zip | |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index d606463aa6d6..b7388a425f09 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -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) |