summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-22 18:33:51 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-22 18:33:51 +0200
commitbfb7bfef6f9e8f113b892070fd622ae1c52e676b (patch)
tree9ee8628ba8301756b007ca30b25be6bdc5d337ea /kernel
parentMerge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentMerge tag 'gic-fixes-for-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-bfb7bfef6f9e8f113b892070fd622ae1c52e676b.tar.xz
linux-bfb7bfef6f9e8f113b892070fd622ae1c52e676b.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar: "Mostly irqchip driver fixes, plus a symbol export" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: kernel/irq: Export irq_set_parent() irqchip/gic: Add missing \n to CPU IF adjustment message irqchip/jcore: Don't show Kconfig menu item for driver irqchip/eznps: Drop pointless static qualifier in nps400_of_init() irqchip/gic-v3-its: Fix entry size mask for GITS_BASER irqchip/gic-v3-its: Fix 64bit GIC{R,ITS}_TYPER accesses
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/manage.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 0c5f1a5db654..9c4d30483264 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -721,6 +721,7 @@ int irq_set_parent(int irq, int parent_irq)
irq_put_desc_unlock(desc, flags);
return 0;
}
+EXPORT_SYMBOL_GPL(irq_set_parent);
#endif
/*