Add a flag to allow the VGA console to be disabled. The VGA code will
spin forever if there isn't any real VGA hardware, which will happen
under Xen.
Signed-off-by: Jeremy Fitzhardinge <[email protected]>
Signed-off-by: Gerd Hoffmann <[email protected]>
Cc: Andrew Morton <[email protected]>
===================================================================
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -71,6 +71,9 @@ unsigned long init_pg_tables_end __initd
int disable_pse __devinitdata = 0;
+/* use to runtime disable vga_con */
+int vgacon_enabled = 1;
+
/*
* Machine setup..
*/
@@ -652,7 +655,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;
===================================================================
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -77,6 +77,8 @@ void __init add_memory_region(unsigned l
void __init add_memory_region(unsigned long long start,
unsigned long long size, int type);
+extern int vgacon_enabled;
+
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
