aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>2006-01-03 13:03:35 +0000
committervhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>2006-01-03 13:03:35 +0000
commitee4eb30e9dea468f988c230d62d0ec4c1cfba1d1 (patch)
tree5e874484c23f81176ef32d06d445a97791efe33b
parentd33de0f49690354f8e2d5cda415aa47b72cbe85b (diff)
downloadxen-ee4eb30e9dea468f988c230d62d0ec4c1cfba1d1.tar.gz
xen-ee4eb30e9dea468f988c230d62d0ec4c1cfba1d1.tar.bz2
xen-ee4eb30e9dea468f988c230d62d0ec4c1cfba1d1.zip
mixup during reorganization. when SIF_INITDOMAIN it should kcons_write_dom0
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/drivers/xen/console/console.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index 1c838f166e..44ae31d087 100644
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -315,12 +315,12 @@ static void __xencons_tx_flush(void)
int sent, sz, work_done = 0;
if (x_char) {
- if (xen_start_info->flags & SIF_INITDOMAIN) {
+ if (xen_start_info->flags & SIF_INITDOMAIN)
+ kcons_write_dom0(NULL, &x_char, 1);
+ else
while (x_char)
if (xencons_ring_send(&x_char, 1) == 1)
break;
- } else
- kcons_write_dom0(NULL, &x_char, 1);
x_char = 0;
work_done = 1;
}