Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk

diff --cc linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
index 87280b7e5f15f9624c5d739ce5d6060cb49c284b,2abfd67c4b319251163c8daf5ca2bb8f3465c510..f1c4d138f94488af26356e681fbe281a4ccead2f
--- 1/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
--- 2/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
@@@ -160,13 -158,9 +158,9 @@@ asmlinkage void evtchn_do_upcall(struc
              l2 &= ~(1 << l2i);
              
              port = (l1i << 5) + l2i;
-           if (uber_debug && cpu)
-               printk("<0>Upcall to %d on %d.\n", port, cpu);
 -            if ( (irq = evtchn_to_irq[port]) != -1 )
 +            if ( (irq = evtchn_to_irq[port]) != -1 ) {
-               if (uber_debug && cpu)
-                   printk("<0>IRQ %d.\n", irq);
                  do_IRQ(irq, regs);
 -            else
 +          } else
                  evtchn_device_upcall(port);
          }
      }

diff --cc xen/arch/x86/mm.c
Simple merge