diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 20:19:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 20:19:38 -0700 |
| commit | 865d872280c848dc78b060088171724c3fb98bbb (patch) | |
| tree | 17590f7da0f0dab34ac21b6e1cd1e7dcf26ed6ba /include | |
| parent | f0d8690ad443069b26df43a1be09c0f14a928eb9 (diff) | |
| parent | 77bb3dfdc0d554befad58fdefbc41be5bc3ed38a (diff) | |
Merge tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull two xen bugfixes from David Vrabel:
- fix ARM build regression.
- fix VIRQ_CONSOLE related oops.
* tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/events: don't bind non-percpu VIRQs with percpu chip
xen/arm: Define xen_arch_suspend()
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/events.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/events.h b/include/xen/events.h index 5321cd9636e6..7d95fdf9cf3e 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -17,7 +17,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn, irq_handler_t handler, unsigned long irqflags, const char *devname, void *dev_id); -int bind_virq_to_irq(unsigned int virq, unsigned int cpu); +int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu); int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, irq_handler_t handler, unsigned long irqflags, const char *devname, |