aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-26 11:42:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-26 11:42:25 -0800
commit4fe5e199ebcd82a05c7446e7e6b85027358dc274 (patch)
tree9a98fc2a40abd0fcdfe18108625f298f09253ef7 /arch/arm/include
parent02a5fec18297bb6991f5bc5ebc7e73fa6810809d (diff)
parent8620015499101090ae275bf11e9bc2f9febfdf08 (diff)
downloadlinux-linaro-stable-4fe5e199ebcd82a05c7446e7e6b85027358dc274.tar.gz
Merge tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel: - Fix gntdev and numa balancing. - Fix x86 boot crash due to unallocated legacy irq descs. - Fix overflow in evtchn device when > 1024 event channels. * tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/evtchn: dynamically grow pending event channel ring xen/events: Always allocate legacy interrupts on PV guests xen/gntdev: Grant maps should not be subject to NUMA balancing
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/irq.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index be1d07d59ee9..1bd9510de1b9 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -40,6 +40,11 @@ extern void arch_trigger_all_cpu_backtrace(bool);
#define arch_trigger_all_cpu_backtrace(x) arch_trigger_all_cpu_backtrace(x)
#endif
+static inline int nr_legacy_irqs(void)
+{
+ return NR_IRQS_LEGACY;
+}
+
#endif
#endif