diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-19 19:37:22 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-22 12:21:14 -0400 |
| commit | 43564bd97d0e6182bbd43b51b33254c728832551 (patch) | |
| tree | e9144230ac732d1ea57273bebdfe54221dd862c3 | |
| parent | cba4235e6031e9318d68186f6d765c531cbea4e1 (diff) | |
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
| -rw-r--r-- | kernel/irq/internals.h | 6 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 33ca83816b8c..2d7927d9fb57 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
| @@ -116,6 +116,12 @@ extern void irq_set_thread_affinity(struct irq_desc *desc); | |||
| 116 | extern int irq_do_set_affinity(struct irq_data *data, | 116 | extern int irq_do_set_affinity(struct irq_data *data, |
| 117 | const struct cpumask *dest, bool force); | 117 | const struct cpumask *dest, bool force); |
| 118 | 118 | ||
| 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 | |||
| 119 | /* Inline functions for support of irq chips on slow busses */ | 125 | /* Inline functions for support of irq chips on slow busses */ |
| 120 | static inline void chip_bus_lock(struct irq_desc *desc) | 126 | static inline void chip_bus_lock(struct irq_desc *desc) |
| 121 | { | 127 | { |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index e2f20d553d60..907fb791ff63 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); | |||
| 345 | /* | 345 | /* |
| 346 | * Generic version of the affinity autoselector. | 346 | * Generic version of the affinity autoselector. |
| 347 | */ | 347 | */ |
| 348 | static int irq_setup_affinity(struct irq_desc *desc) | 348 | int irq_setup_affinity(struct irq_desc *desc) |
| 349 | { | 349 | { |
| 350 | struct cpumask *set = irq_default_affinity; | 350 | struct cpumask *set = irq_default_affinity; |
| 351 | int ret, node = irq_desc_get_node(desc); | 351 | int ret, node = irq_desc_get_node(desc); |
| @@ -404,11 +404,6 @@ int irq_select_affinity_usr(unsigned int irq) | |||
| 404 | raw_spin_unlock_irqrestore(&desc->lock, flags); | 404 | raw_spin_unlock_irqrestore(&desc->lock, flags); |
| 405 | return ret; | 405 | return ret; |
| 406 | } | 406 | } |
| 407 | #else | ||
| 408 | static inline int setup_affinity(struct irq_desc *desc) | ||
| 409 | { | ||
| 410 | return 0; | ||
| 411 | } | ||
| 412 | #endif | 407 | #endif |
| 413 | 408 | ||
| 414 | /** | 409 | /** |
