From a3f387eb2ac58c2751345bb7a06dfa5b30c79f04 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 15 Jan 2011 21:33:09 +0100
Subject: Avoid dropping kd_intr when RCLINE is >= 0

* i386/i386at/kd.c (kdintr): Return immediately if !kd_initialized.
* i386/i386at/pic_isa.c (ivect) [RCLINE >= 0]: Enable kdintr in that case
too.
---
 i386/i386at/kd.c      | 3 +++
 i386/i386at/pic_isa.c | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 4ac1dfe..eaeea1b 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -748,6 +748,9 @@ int	regs;
 	if (kd_pollc)
 	    return;				/* kdb polling kbd */
 
+	if (!kd_initialized)
+		return;
+
 	tp = &kd_tty;
 #ifdef	old
 	while ((inb(K_STATUS) & K_OBUF_FUL) == 0);	/* this should never loop */
diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c
index 811ee1c..ef7d84c 100644
--- a/i386/i386at/pic_isa.c
+++ b/i386/i386at/pic_isa.c
@@ -35,11 +35,7 @@ extern void prtnull();
 
 void (*ivect[NINTR])() = {
 	/* 00 */	hardclock,	/* always */
-#if RCLINE < 0
 	/* 01 */	kdintr,		/* kdintr, ... */
-#else
-	/* 01 */	intnull,	/* kdintr, ... */
-#endif
 	/* 02 */	intnull,
 	/* 03 */	intnull,	/* lnpoll, comintr, ... */
 
-- 
cgit v1.2.3