summaryrefslogtreecommitdiff
path: root/i386/i386at
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-01-15 21:33:09 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-01-15 21:33:09 +0100
commita3f387eb2ac58c2751345bb7a06dfa5b30c79f04 (patch)
treef065203cffa686459b520cd699f3d4f96a3273c3 /i386/i386at
parentc5e1672a23634eb59f1f9d87f3fb7b6c9fc77029 (diff)
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.
Diffstat (limited to 'i386/i386at')
-rw-r--r--i386/i386at/kd.c3
-rw-r--r--i386/i386at/pic_isa.c4
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, ... */