Merge branch 'orochi-v9' of git://xenbits.xen.org/people/dvrabel/linux into devel...

* 'orochi-v9' of git://xenbits.xen.org/people/dvrabel/linux:
  xen/events: use the FIFO-based ABI if available
  xen/x86: set VIRQ_TIMER priority to maximum
  xen/events: allow event channel priority to be set
  xen/events: Add the hypervisor interface for the FIFO-based event channels
  xen/evtchn: support more than 4096 ports
  xen/events: add xen_evtchn_mask_all()
  xen/events: Refactor evtchn_to_irq array to be dynamically allocated
  xen/events: add a evtchn_op for port setup
  xen/events: allow setup of irq_info to fail
  xen/events: add struct evtchn_ops for the low-level port operations
  xen/events: move 2-level specific code into its own file
  xen/events: move drivers/xen/events.c into drivers/xen/events/
  xen/events: replace raw bit ops with functions
  xen/events: introduce test_and_set_mask()
  xen/events: remove unnecessary init_evtchn_cpu_bindings()
  xen/events: refactor retrigger_dynirq() and resend_irq_on_evtchn()

diff --cc arch/x86/xen/time.c
index 12a1ca707b94258466122b5f2d793726f8185d54,10e11c188222d98266b20b23d6bbe4678aa97f20..7b78f88c1707b994b34f20408bc1b6046447eb22
--- 1/arch/x86/xen/time.c
--- 2/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@@ -443,9 -443,11 +443,10 @@@ void xen_setup_timer(int cpu
                name = "<timer kasprintf failed>";
  
        irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt,
 -                                    IRQF_DISABLED|IRQF_PERCPU|
 -                                    IRQF_NOBALANCING|IRQF_TIMER|
 +                                    IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER|
                                      IRQF_FORCE_RESUME,
                                      name, NULL);
+       (void)xen_set_irq_priority(irq, XEN_IRQ_PRIORITY_MAX);
  
        memcpy(evt, xen_clockevent, sizeof(*evt));
  

diff --cc drivers/xen/evtchn.c
Simple merge