• Linus Torvalds's avatar
    Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of... · 5a39837f
    Linus Torvalds authored
    Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'stable/irq.fairness' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: events: Remove redundant clear of l2i at end of round-robin loop
      xen: events: Make round-robin scan fairer by snapshotting each l2 word once only
      xen: events: Clean up round-robin evtchn scan.
      xen: events: Make last processed event channel a per-cpu variable.
      xen: events: Process event channels notifications in round-robin order.
    
    * 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: events: Fix compile error if CONFIG_SMP is not defined.
      xen: events: correct locking in xen_irq_from_pirq
      xen: events: propagate irq allocation failure instead of panicking
      xen: events: do not workaround too-small nr_irqs
      xen: events: remove use of nr_irqs as upper bound on number of pirqs
      xen: events: dynamically allocate irq info structures
      xen: events: maintain a list of Xen interrupts
      xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions
      xen: events: turn irq_info constructors into initialiser functions
      xen: events: use per-cpu variable for cpu_evtchn_mask
      xen: events: refactor GSI pirq bindings functions
      xen: events: rename restore_cpu_pirqs -> restore_pirqs
      xen: events: remove unused public functions
      xen: events: fix xen_map_pirq_gsi error return
      xen: events: simplify comment
      xen: events: separate two unrelated halves of if condition
    
    Fix up trivial conflicts in drivers/xen/events.c
    5a39837f
events.h 3.2 KB