Re: Oops
From: Gerd Hoffmann <hidden>
Date: 2007-01-12 08:31:19
quoted hunk ↗ jump to hunk
diff -r e1974f36aa13 arch/i386/kernel/setup.c--- a/arch/i386/kernel/setup.c Wed Jan 10 18:19:52 2007 -0800 +++ b/arch/i386/kernel/setup.c Thu Jan 11 18:32:22 2007 -0800
[ ... ]
quoted hunk ↗ jump to hunk
@@ -643,7 +646,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE) - if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY)) + if (vgacon_enabled && (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))) conswitchp = &vga_con; #elif defined(CONFIG_DUMMY_CONSOLE) conswitchp = &dummy_con;
[ ... ] Approach looks fine to me, please put into the paravirt patch queue. Well, maybe we can make the efi stuff just set vgacon_disabled too to make the whole thing more readable. Hmm, one more thing: I think we should set conswitchp to dummy_con in case vgacon is disabled. Otherwise the vt subsystem isn't initialized at all and we'll have problems making fbcon+pvfb work later on ... cheers, Gerd -- Gerd Hoffmann [off-list ref]