From: Yipeng Zou zouyipeng@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I6WPFT CVE: NA
--------------------------------
This reverts commit 6ea5519695b2b55fa34d632acc1153b3b55dbabb.
Signed-off-by: Yipeng Zou zouyipeng@huawei.com Reviewed-by: Zhang Jianhua chris.zjh@huawei.com Signed-off-by: Yongqiang Liu liuyongqiang13@huawei.com --- drivers/irqchip/irq-gic-v3-its.c | 8 +------- kernel/irq/Kconfig | 4 +--- kernel/irq/migration.c | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 7a0adf67761e..15a0292e8e61 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1162,12 +1162,6 @@ static void its_unmask_irq(struct irq_data *d) lpi_update_config(d, 0, LPI_PROP_ENABLED); }
-static void its_irq_chip_eoi(struct irq_data *d) -{ - irq_move_irq(d); - irq_chip_eoi_parent(d); -} - static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { @@ -1491,7 +1485,7 @@ static struct irq_chip its_irq_chip = { .name = "ITS", .irq_mask = its_mask_irq, .irq_unmask = its_unmask_irq, - .irq_eoi = its_irq_chip_eoi, + .irq_eoi = irq_chip_eoi_parent, .irq_set_affinity = its_set_affinity, .irq_compose_msi_msg = its_irq_compose_msi_msg, .irq_set_irqchip_state = its_irq_set_irqchip_state, diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index 743afe22fdfc..0beb81d2dcbe 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -32,9 +32,7 @@ config GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
# Support for delayed migration from interrupt context config GENERIC_PENDING_IRQ - bool "Support for delayed migration from interrupt context" - depends on SMP - default n + bool
# Support for generic irq migrating off cpu before the cpu is offline. config GENERIC_IRQ_MIGRATION diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index f752d9ff8ee1..1ca2fbf5c32d 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c @@ -122,5 +122,3 @@ void __irq_move_irq(struct irq_data *idata) if (!masked) idata->chip->irq_unmask(idata); } - -void __weak irq_force_complete_move(struct irq_desc *desc) { }