ia64/xen-unstable

changeset 7509:4ef1a7322bf4

Fix console output and bug in evtchn_ia64 (by Tristan Gingold)
author djm@kirby.fc.hp.com
date Thu Nov 03 07:21:26 2005 -0600 (2005-11-03)
parents 55aaa12a542a
children 7b3230c51fbb
files linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c	Thu Nov 03 07:14:09 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c	Thu Nov 03 07:21:26 2005 -0600
     1.3 @@ -22,6 +22,7 @@ unsigned int bind_virq_to_evtchn(int vir
     1.4  
     1.5      op.cmd = EVTCHNOP_bind_virq;
     1.6      op.u.bind_virq.virq = virq;
     1.7 +    op.u.bind_virq.vcpu = 0;
     1.8      if ( HYPERVISOR_event_channel_op(&op) != 0 )
     1.9          BUG();
    1.10  
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch	Thu Nov 03 07:14:09 2005 -0600
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch	Thu Nov 03 07:21:26 2005 -0600
     2.3 @@ -1,7 +1,16 @@
     2.4 -diff -Naur xen/console/console.c xen.patched/console/console.c
     2.5 ---- xen/console/console.c	2005-09-23 10:54:50.000000000 -0600
     2.6 -+++ xen.patched/console/console.c	2005-09-23 10:57:51.000000000 -0600
     2.7 -@@ -768,9 +768,16 @@
     2.8 +--- xen/console/console.c	2005-11-02 14:13:07.000000000 +0100
     2.9 ++++ xen.patched/console/console.c	2005-11-02 14:21:20.000000000 +0100
    2.10 +@@ -196,6 +196,9 @@
    2.11 + void xen_console_init(void)
    2.12 + #endif
    2.13 + {
    2.14 ++	if (xen_init() < 0)
    2.15 ++		return __RETCODE;
    2.16 ++
    2.17 + 	if (xen_start_info->flags & SIF_INITDOMAIN) {
    2.18 + 		if (xc_mode == XC_DEFAULT)
    2.19 + 			xc_mode = XC_SERIAL;
    2.20 +@@ -768,9 +771,15 @@
    2.21   #endif
    2.22   
    2.23   	if (xen_start_info->flags & SIF_INITDOMAIN) {
    2.24 @@ -10,8 +19,7 @@ diff -Naur xen/console/console.c xen.pat
    2.25  +		bind_evtchn_to_irqhandler(xencons_priv_irq,
    2.26  +				xencons_priv_interrupt, 0, "console", NULL);
    2.27  +#else
    2.28 -+
    2.29 - 		xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE);
    2.30 + 		xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
    2.31   		(void)request_irq(xencons_priv_irq,
    2.32   				  xencons_priv_interrupt, 0, "console", NULL);
    2.33  +#endif