Skip to content

Commit

Permalink
genirq: Rename setup_affinity() to irq_setup_affinity()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Thomas Gleixner committed Jun 22, 2017
1 parent cba4235 commit 43564bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 6 additions & 0 deletions kernel/irq/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ extern void irq_set_thread_affinity(struct irq_desc *desc);
extern int irq_do_set_affinity(struct irq_data *data,
const struct cpumask *dest, bool force);

#ifdef CONFIG_SMP
extern int irq_setup_affinity(struct irq_desc *desc);
#else
static inline int irq_setup_affinity(struct irq_desc *desc) { return 0; }
#endif

/* Inline functions for support of irq chips on slow busses */
static inline void chip_bus_lock(struct irq_desc *desc)
{
Expand Down
7 changes: 1 addition & 6 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
/*
* Generic version of the affinity autoselector.
*/
static int irq_setup_affinity(struct irq_desc *desc)
int irq_setup_affinity(struct irq_desc *desc)
{
struct cpumask *set = irq_default_affinity;
int ret, node = irq_desc_get_node(desc);
Expand Down Expand Up @@ -404,11 +404,6 @@ int irq_select_affinity_usr(unsigned int irq)
raw_spin_unlock_irqrestore(&desc->lock, flags);
return ret;
}
#else
static inline int setup_affinity(struct irq_desc *desc)
{
return 0;
}
#endif

/**
Expand Down

0 comments on commit 43564bd

Please sign in to comment.