diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-12-25 22:30:58 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-25 11:02:39 -0800 |
| commit | 11cc92eb747aace5aa2b54b65b5cb8325a8981de (patch) | |
| tree | d796d915216212d4f7421e30a0645d25be49d21b | |
| parent | 7bb5226c8a4bbf26a9ededc90532b0ad539d2017 (diff) | |
| download | linux-stable-11cc92eb747aace5aa2b54b65b5cb8325a8981de.tar.gz linux-stable-11cc92eb747aace5aa2b54b65b5cb8325a8981de.tar.bz2 linux-stable-11cc92eb747aace5aa2b54b65b5cb8325a8981de.zip | |
genirq: Fix export of irq_to_desc() for powerpc KVM
Commit 64a1b95bb9fe ("genirq: Restrict export of irq_to_desc()") removed
the export of irq_to_desc() unless powerpc KVM is being built, because
there is still a use of irq_to_desc() in modular code there.
However it used:
#ifdef CONFIG_KVM_BOOK3S_64_HV
Which doesn't work when that symbol is =m, leading to a build failure:
ERROR: modpost: "irq_to_desc" [arch/powerpc/kvm/kvm-hv.ko] undefined!
Fix it by checking for the definedness of the correct symbol which is
CONFIG_KVM_BOOK3S_64_HV_MODULE.
Fixes: 64a1b95bb9fe ("genirq: Restrict export of irq_to_desc()")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/irq/irqdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 3d0bc38a0bcf..cc1a09406c6e 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -352,7 +352,7 @@ struct irq_desc *irq_to_desc(unsigned int irq) { return radix_tree_lookup(&irq_desc_tree, irq); } -#ifdef CONFIG_KVM_BOOK3S_64_HV +#ifdef CONFIG_KVM_BOOK3S_64_HV_MODULE EXPORT_SYMBOL_GPL(irq_to_desc); #endif |