diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 18:27:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 18:27:49 -0700 |
commit | 5a39837f76b7ded29afdf6ed2c2d5e56107179b7 (patch) | |
tree | 1b5af6b3d87788df23458f45f96071552905c3e3 /arch | |
parent | 514af9f7904ab65a6763b4b0bf51f1c7081026cb (diff) | |
parent | 3b7bcdf2823a59438301a73af8d0d31439a8f3d9 (diff) | |
parent | 44626e4a3bd764283193e14e64f9324e48b4bfd8 (diff) | |
download | linux-3.10-5a39837f76b7ded29afdf6ed2c2d5e56107179b7.tar.gz linux-3.10-5a39837f76b7ded29afdf6ed2c2d5e56107179b7.tar.bz2 linux-3.10-5a39837f76b7ded29afdf6ed2c2d5e56107179b7.zip |
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