aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-05-20 23:07:55 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-05-20 23:07:55 +0000
commit01490a70994811e6257e63754134c69faa2819f2 (patch)
treea2fe1288dd873b0c6e5c8da516ba5eaa4c5bd5ef
parentf9307625e8fe55ca4bf5d335875787f954ef0bd9 (diff)
parenta61726b96d45a362cf210ff137318b5dd1751403 (diff)
downloadxen-01490a70994811e6257e63754134c69faa2819f2.tar.gz
xen-01490a70994811e6257e63754134c69faa2819f2.tar.bz2
xen-01490a70994811e6257e63754134c69faa2819f2.zip
bitkeeper revision 1.1159.258.148 (428e6dcbkxoX3zvO7TFFgnoq2o9fRw)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
-rw-r--r--xen/drivers/char/console.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index f4864f5744..e2fa7efc26 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -280,6 +280,7 @@ static void serial_rx(unsigned char c, struct xen_regs *regs)
{
switch_serial_input();
switch_code_count = 0;
+ return;
}
}
else