From 772187a1fcfe932b5e454ccbdf565b49e1c1d155 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 17 Aug 2016 15:12:51 +0300 Subject: [PATCH] 8444 uts: set_console_mode() should check for BIOS --- arch/x86/kernel/platform/i86pc/os/mlsetup.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/platform/i86pc/os/mlsetup.c b/arch/x86/kernel/platform/i86pc/os/mlsetup.c index a5b973b56e..730788fdaa 100644 --- a/arch/x86/kernel/platform/i86pc/os/mlsetup.c +++ b/arch/x86/kernel/platform/i86pc/os/mlsetup.c @@ -342,12 +342,17 @@ mlsetup(struct regs *rp) if (boothowto & RB_DEBUG) kdi_idt_sync(); - /* - * Explicitly set console to text mode (0x3) if this is a boot - * post Fast Reboot, and the console is set to CONS_SCREEN_TEXT. - */ - if (post_fastreboot && boot_console_type(NULL) == CONS_SCREEN_TEXT) - set_console_mode(0x3); + if (BOP_GETPROPLEN(bootops, "efi-systab") < 0) { + /* + * In BIOS system, explicitly set console to text mode (0x3) + * if this is a boot post Fast Reboot, and the console is set + * to CONS_SCREEN_TEXT. + */ + if (post_fastreboot && + boot_console_type(NULL) == CONS_SCREEN_TEXT) { + set_console_mode(0x3); + } + } /* * If requested (boot -d) drop into kmdb. -- 2.11.4.GIT