Skip to content

Commit 36d84fb

Browse files
committedJun 22, 2017
genirq: Move irq_fixup_move_pending() to core
Now that x86 uses the generic code, the function declaration and inline stub can move to the core internal header. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Keith Busch <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Christoph Hellwig <[email protected]> Link: http://lkml.kernel.org/r/[email protected]
1 parent ad7a929 commit 36d84fb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎include/linux/irq.h

-5
Original file line numberDiff line numberDiff line change
@@ -492,15 +492,10 @@ extern void irq_migrate_all_off_this_cpu(void);
492492
void irq_move_irq(struct irq_data *data);
493493
void irq_move_masked_irq(struct irq_data *data);
494494
void irq_force_complete_move(struct irq_desc *desc);
495-
bool irq_fixup_move_pending(struct irq_desc *desc, bool force_clear);
496495
#else
497496
static inline void irq_move_irq(struct irq_data *data) { }
498497
static inline void irq_move_masked_irq(struct irq_data *data) { }
499498
static inline void irq_force_complete_move(struct irq_desc *desc) { }
500-
static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear)
501-
{
502-
return false;
503-
}
504499
#endif
505500

506501
extern int no_irq_affinity;

‎kernel/irq/internals.h

+5
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ static inline struct cpumask *irq_desc_get_pending_mask(struct irq_desc *desc)
272272
{
273273
return desc->pending_mask;
274274
}
275+
bool irq_fixup_move_pending(struct irq_desc *desc, bool force_clear);
275276
#else /* CONFIG_GENERIC_PENDING_IRQ */
276277
static inline bool irq_can_move_pcntxt(struct irq_data *data)
277278
{
@@ -293,6 +294,10 @@ static inline struct cpumask *irq_desc_get_pending_mask(struct irq_desc *desc)
293294
{
294295
return NULL;
295296
}
297+
static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear)
298+
{
299+
return false;
300+
}
296301
#endif /* !CONFIG_GENERIC_PENDING_IRQ */
297302

298303
#ifdef CONFIG_GENERIC_IRQ_DEBUGFS

0 commit comments

Comments
 (0)
Please sign in to comment.