diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-30 14:50:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-30 14:50:33 -0400 |
| commit | f155b6303d938462aaa31a8c7d409f3ea9012713 (patch) | |
| tree | 1a927f9e20585f8edabb8369951add97bdaacd3e /arch | |
| parent | eaa5a990191d204ba0f9d35dbe5505ec2cdd1460 (diff) | |
| parent | df981edcb9bce00b9c5e4f3cc33f3f98bc9a2394 (diff) | |
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) | |||
| 225 | unsigned long nr_pages; | 225 | unsigned long nr_pages; |
| 226 | 226 | ||
| 227 | nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; | 227 | nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; |
| 228 | efi_call_phys2(sys_table->boottime->free_pages, addr, size); | 228 | efi_call_phys2(sys_table->boottime->free_pages, addr, nr_pages); |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | static void find_bits(unsigned long mask, u8 *pos, u8 *size) | 231 | static void find_bits(unsigned long mask, u8 *pos, u8 *size) |