mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-02 17:53:24 +00:00
87 lines
2.8 KiB
Diff
87 lines
2.8 KiB
Diff
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 17 Oct 2019 12:19:02 +0200
|
|
Subject: [PATCH] x86/ioapic: Rename misnamed functions
|
|
|
|
ioapic_irqd_[un]mask() are misnomers as both functions do way more than
|
|
masking and unmasking the interrupt line. Both deal with the moving the
|
|
affinity of the interrupt within interrupt context. The mask/unmask is just
|
|
a tiny part of the functionality.
|
|
|
|
Rename them to ioapic_prepare/finish_move(), fixup the call sites and
|
|
rename the related variables in the code to reflect what this is about.
|
|
|
|
No functional change.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Sebastian Siewior <bigeasy@linutronix.de>
|
|
Link: https://lkml.kernel.org/r/20191017101938.412489856@linutronix.de
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
arch/x86/kernel/apic/io_apic.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/x86/kernel/apic/io_apic.c
|
|
+++ b/arch/x86/kernel/apic/io_apic.c
|
|
@@ -1725,7 +1725,7 @@ static bool io_apic_level_ack_pending(st
|
|
return false;
|
|
}
|
|
|
|
-static inline bool ioapic_irqd_mask(struct irq_data *data)
|
|
+static inline bool ioapic_prepare_move(struct irq_data *data)
|
|
{
|
|
/* If we are moving the IRQ we need to mask it */
|
|
if (unlikely(irqd_is_setaffinity_pending(data))) {
|
|
@@ -1736,9 +1736,9 @@ static inline bool ioapic_irqd_mask(stru
|
|
return false;
|
|
}
|
|
|
|
-static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
|
|
+static inline void ioapic_finish_move(struct irq_data *data, bool moveit)
|
|
{
|
|
- if (unlikely(masked)) {
|
|
+ if (unlikely(moveit)) {
|
|
/* Only migrate the irq if the ack has been received.
|
|
*
|
|
* On rare occasions the broadcast level triggered ack gets
|
|
@@ -1773,11 +1773,11 @@ static inline void ioapic_irqd_unmask(st
|
|
}
|
|
}
|
|
#else
|
|
-static inline bool ioapic_irqd_mask(struct irq_data *data)
|
|
+static inline bool ioapic_prepare_move(struct irq_data *data)
|
|
{
|
|
return false;
|
|
}
|
|
-static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)
|
|
+static inline void ioapic_finish_move(struct irq_data *data, bool moveit)
|
|
{
|
|
}
|
|
#endif
|
|
@@ -1786,11 +1786,11 @@ static void ioapic_ack_level(struct irq_
|
|
{
|
|
struct irq_cfg *cfg = irqd_cfg(irq_data);
|
|
unsigned long v;
|
|
- bool masked;
|
|
+ bool moveit;
|
|
int i;
|
|
|
|
irq_complete_move(cfg);
|
|
- masked = ioapic_irqd_mask(irq_data);
|
|
+ moveit = ioapic_prepare_move(irq_data);
|
|
|
|
/*
|
|
* It appears there is an erratum which affects at least version 0x11
|
|
@@ -1845,7 +1845,7 @@ static void ioapic_ack_level(struct irq_
|
|
eoi_ioapic_pin(cfg->vector, irq_data->chip_data);
|
|
}
|
|
|
|
- ioapic_irqd_unmask(irq_data, masked);
|
|
+ ioapic_finish_move(irq_data, moveit);
|
|
}
|
|
|
|
static void ioapic_ir_ack_level(struct irq_data *irq_data)
|