---

 25-akpm/drivers/char/vt.c          |    2 +-
 drivers/char/vt.c.orig             |    0 
 drivers/char/vt.c.rej              |    0 
 drivers/char/vt.c~softcursor-fix   |    0 
 drivers/char/vt.c~vc-init-race-fix |    0 
 drivers/char/vt.c~vt-locking-fixes |    0 
 6 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/char/vt.c~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c
--- 25/drivers/char/vt.c~vt-locking-fixes-oops_in_progress-fix	Thu Jan  8 16:00:18 2004
+++ 25-akpm/drivers/char/vt.c	Thu Jan  8 16:00:30 2004
@@ -2790,7 +2790,7 @@ void unblank_screen(void)
 {
 	int currcons;
 
-	WARN_ON(!is_console_locked());
+	WARN_ON(!is_console_locked() && !oops_in_progress);
 
 	ignore_poke = 0;
 	if (!console_blanked)
diff -puN drivers/char/vt.c.orig~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c.orig
diff -puN drivers/char/vt.c.rej~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c.rej
diff -puN drivers/char/vt.c~softcursor-fix~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c~softcursor-fix
diff -puN drivers/char/vt.c~vc-init-race-fix~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c~vc-init-race-fix
diff -puN drivers/char/vt.c~vt-locking-fixes~vt-locking-fixes-oops_in_progress-fix drivers/char/vt.c~vt-locking-fixes

_