diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 10:00:54 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 10:00:54 +0300 |
commit | 5d331b5922551637c586cdf5fdc1778910fc937f (patch) | |
tree | 8f7514513f7ac2f76373a103054f04042d19d3b8 /arch/powerpc/sysdev/xive/common.c | |
parent | cd455ebb748c4e198c8158e5d61b3034bf10f22b (diff) | |
parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
download | linux-5d331b5922551637c586cdf5fdc1778910fc937f.tar.xz |
Merge 5.16-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/sysdev/xive/common.c')
-rw-r--r-- | arch/powerpc/sysdev/xive/common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index c5d75c02ad8b..7b69299c2912 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -1443,8 +1443,7 @@ static const struct irq_domain_ops xive_irq_domain_ops = { static void __init xive_init_host(struct device_node *np) { - xive_irq_domain = irq_domain_add_nomap(np, XIVE_MAX_IRQ, - &xive_irq_domain_ops, NULL); + xive_irq_domain = irq_domain_add_tree(np, &xive_irq_domain_ops, NULL); if (WARN_ON(xive_irq_domain == NULL)) return; irq_set_default_host(xive_irq_domain); |