[PATCH] [34/34] x86_64: ignore vgacon if hardware not present
- From: Andi Kleen <ak@xxxxxxx>
- Date: Mon, 30 Apr 2007 17:50:07 +0200 (CEST)
From: Gerd Hoffmann <kraxel@xxxxxxx>
Avoid trying to set up vgacon if there's no vga hardware present.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Cc: Alan <alan@xxxxxxxxxxxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
---
drivers/video/console/vgacon.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
===================================================================
Index: linux/drivers/video/console/vgacon.c
===================================================================
--- linux.orig/drivers/video/console/vgacon.c
+++ linux/drivers/video/console/vgacon.c
@@ -371,7 +371,8 @@ static const char *vgacon_startup(void)
}
/* VGA16 modes are not handled by VGACON */
- if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
+ if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */
+ (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
(ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */
(ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */
(ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- References:
- Prev by Date: [PATCH] [32/34] x86_64: unexport cpu_llc_id
- Next by Date: [PATCH] [24/34] x86_64: Auto compute __NR_syscall_max at compile time
- Previous by thread: [PATCH] [32/34] x86_64: unexport cpu_llc_id
- Next by thread: [PATCH] [24/34] x86_64: Auto compute __NR_syscall_max at compile time
- Index(es):
Relevant Pages
|
|
