diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-09 14:03:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-09 14:03:56 -0800 |
| commit | 4b04e73a78c5c89dc1a75fb35dea6c947c1d2ac7 (patch) | |
| tree | 233976378da2a7f86929cdbb5315eb641498893f /arch/x86/platform/efi/early_printk.c | |
| parent | Merge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (diff) | |
| parent | x86/earlyprintk/efi: Fix infinite loop on some screen widths (diff) | |
| download | linux-dev-4b04e73a78c5c89dc1a75fb35dea6c947c1d2ac7.tar.xz linux-dev-4b04e73a78c5c89dc1a75fb35dea6c947c1d2ac7.zip | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Two fixes: a large-system fix and an earlyprintk fix with certain
resolutions"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/earlyprintk/efi: Fix infinite loop on some screen widths
x86/efi: Allocate e820 buffer before calling efi_exit_boot_service
Diffstat (limited to 'arch/x86/platform/efi/early_printk.c')
| -rw-r--r-- | arch/x86/platform/efi/early_printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c index 7476b3b097e1..7138bc7a265c 100644 --- a/arch/x86/platform/efi/early_printk.c +++ b/arch/x86/platform/efi/early_printk.c @@ -183,7 +183,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) num--; } - if (efi_x >= si->lfb_width) { + if (efi_x + font->width > si->lfb_width) { efi_x = 0; efi_y += font->height; } |