From d95c7807b5a2ba6585932299a73ff1ff126f369b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 12 Dec 2020 13:59:12 +0100 Subject: [PATCH] ANDROID: GKI: bring back irq_create_mapping() Upstream commit bb4c6910c8b4 ("genirq/irqdomain: Add an irq_create_mapping_affinity() function") ended up removing the irq_create_mapping() function and replacing it with an inline function. That's fine, except that this function was one of our "must support" api calls, so put it back as an exported function to preserve the ABI. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Ibb1c480c0ba4eb8b3d6c71cabf83467ee2d1f12b --- include/linux/irqdomain.h | 8 +------- kernel/irq/irqdomain.c | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index add340838848..e596d00373d5 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -392,16 +392,10 @@ extern void irq_domain_disassociate(struct irq_domain *domain, extern unsigned int irq_create_mapping_affinity(struct irq_domain *host, irq_hw_number_t hwirq, const struct irq_affinity_desc *affinity); +unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq); extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec); extern void irq_dispose_mapping(unsigned int virq); -static inline unsigned int irq_create_mapping(struct irq_domain *host, - irq_hw_number_t hwirq) -{ - return irq_create_mapping_affinity(host, hwirq, NULL); -} - - /** * irq_linear_revmap() - Find a linux irq from a hw irq number. * @domain: domain owning this hardware interrupt diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index ba6eedfb0ffd..f222c7032b91 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -696,6 +696,12 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, } EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); +unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq) +{ + return irq_create_mapping_affinity(host, hwirq, NULL); +} +EXPORT_SYMBOL_GPL(irq_create_mapping); + /** * irq_create_strict_mappings() - Map a range of hw irqs to fixed linux irqs * @domain: domain owning the interrupt range