[Xen-changelog] Fix console output and bug in evtchn_ia64 (by Tristan Gingold)

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 4ef1a7322bf4950fd56f8325871c10e8605dd3b6
# Parent  55aaa12a542abae9e77a1110322255d86a156631
Fix console output and bug in evtchn_ia64 (by Tristan Gingold)

diff -r 55aaa12a542a -r 4ef1a7322bf4 
linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c  Thu Nov  3 
13:14:09 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c  Thu Nov  3 
13:21:26 2005
@@ -22,6 +22,7 @@
 
     op.cmd = EVTCHNOP_bind_virq;
     op.u.bind_virq.virq = virq;
+    op.u.bind_virq.vcpu = 0;
     if ( HYPERVISOR_event_channel_op(&op) != 0 )
         BUG();
 
diff -r 55aaa12a542a -r 4ef1a7322bf4 
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch        
Thu Nov  3 13:14:09 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch        
Thu Nov  3 13:21:26 2005
@@ -1,7 +1,16 @@
-diff -Naur xen/console/console.c xen.patched/console/console.c
---- xen/console/console.c      2005-09-23 10:54:50.000000000 -0600
-+++ xen.patched/console/console.c      2005-09-23 10:57:51.000000000 -0600
-@@ -768,9 +768,16 @@
+--- xen/console/console.c      2005-11-02 14:13:07.000000000 +0100
++++ xen.patched/console/console.c      2005-11-02 14:21:20.000000000 +0100
+@@ -196,6 +196,9 @@
+ void xen_console_init(void)
+ #endif
+ {
++      if (xen_init() < 0)
++              return __RETCODE;
++
+       if (xen_start_info->flags & SIF_INITDOMAIN) {
+               if (xc_mode == XC_DEFAULT)
+                       xc_mode = XC_SERIAL;
+@@ -768,9 +771,15 @@
  #endif
  
        if (xen_start_info->flags & SIF_INITDOMAIN) {
@@ -10,8 +19,7 @@
 +              bind_evtchn_to_irqhandler(xencons_priv_irq,
 +                              xencons_priv_interrupt, 0, "console", NULL);
 +#else
-+
-               xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE);
+               xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
                (void)request_irq(xencons_priv_irq,
                                  xencons_priv_interrupt, 0, "console", NULL);
 +#endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog