Skip to content

Commit 43564bd

Browse files
committed
genirq: Rename setup_affinity() to irq_setup_affinity()
Rename it with a proper irq_ prefix and make it available for other files in the core code. Preparatory patch for moving the irq affinity setup around. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jens Axboe <axboe@kernel.dk> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Keith Busch <keith.busch@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Christoph Hellwig <hch@lst.de> Link: http://lkml.kernel.org/r/20170619235444.928501004@linutronix.de
1 parent cba4235 commit 43564bd

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

kernel/irq/internals.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ extern void irq_set_thread_affinity(struct irq_desc *desc);
116116
extern int irq_do_set_affinity(struct irq_data *data,
117117
const struct cpumask *dest, bool force);
118118

119+
#ifdef CONFIG_SMP
120+
extern int irq_setup_affinity(struct irq_desc *desc);
121+
#else
122+
static inline int irq_setup_affinity(struct irq_desc *desc) { return 0; }
123+
#endif
124+
119125
/* Inline functions for support of irq chips on slow busses */
120126
static inline void chip_bus_lock(struct irq_desc *desc)
121127
{

kernel/irq/manage.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
345345
/*
346346
* Generic version of the affinity autoselector.
347347
*/
348-
static int irq_setup_affinity(struct irq_desc *desc)
348+
int irq_setup_affinity(struct irq_desc *desc)
349349
{
350350
struct cpumask *set = irq_default_affinity;
351351
int ret, node = irq_desc_get_node(desc);
@@ -404,11 +404,6 @@ int irq_select_affinity_usr(unsigned int irq)
404404
raw_spin_unlock_irqrestore(&desc->lock, flags);
405405
return ret;
406406
}
407-
#else
408-
static inline int setup_affinity(struct irq_desc *desc)
409-
{
410-
return 0;
411-
}
412407
#endif
413408

414409
/**

0 commit comments

Comments
 (0)