diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/manage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 291f03664552..38008b80bd59 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -109,7 +109,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask) | |||
109 | /* | 109 | /* |
110 | * Generic version of the affinity autoselector. | 110 | * Generic version of the affinity autoselector. |
111 | */ | 111 | */ |
112 | int do_irq_select_affinity(unsigned int irq, struct irq_desc *desc) | 112 | static int setup_affinity(unsigned int irq, struct irq_desc *desc) |
113 | { | 113 | { |
114 | if (!irq_can_set_affinity(irq)) | 114 | if (!irq_can_set_affinity(irq)) |
115 | return 0; | 115 | return 0; |
@@ -133,7 +133,7 @@ set_affinity: | |||
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | #else | 135 | #else |
136 | static inline int do_irq_select_affinity(unsigned int irq, struct irq_desc *d) | 136 | static inline int setup_affinity(unsigned int irq, struct irq_desc *d) |
137 | { | 137 | { |
138 | return irq_select_affinity(irq); | 138 | return irq_select_affinity(irq); |
139 | } | 139 | } |
@@ -149,14 +149,14 @@ int irq_select_affinity_usr(unsigned int irq) | |||
149 | int ret; | 149 | int ret; |
150 | 150 | ||
151 | spin_lock_irqsave(&desc->lock, flags); | 151 | spin_lock_irqsave(&desc->lock, flags); |
152 | ret = do_irq_select_affinity(irq, desc); | 152 | ret = setup_affinity(irq, desc); |
153 | spin_unlock_irqrestore(&desc->lock, flags); | 153 | spin_unlock_irqrestore(&desc->lock, flags); |
154 | 154 | ||
155 | return ret; | 155 | return ret; |
156 | } | 156 | } |
157 | 157 | ||
158 | #else | 158 | #else |
159 | static inline int do_irq_select_affinity(int irq, struct irq_desc *desc) | 159 | static inline int setup_affinity(unsigned int irq, struct irq_desc *desc) |
160 | { | 160 | { |
161 | return 0; | 161 | return 0; |
162 | } | 162 | } |
@@ -488,7 +488,7 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) | |||
488 | desc->status |= IRQ_NO_BALANCING; | 488 | desc->status |= IRQ_NO_BALANCING; |
489 | 489 | ||
490 | /* Set default affinity mask once everything is setup */ | 490 | /* Set default affinity mask once everything is setup */ |
491 | do_irq_select_affinity(irq, desc); | 491 | setup_affinity(irq, desc); |
492 | 492 | ||
493 | } else if ((new->flags & IRQF_TRIGGER_MASK) | 493 | } else if ((new->flags & IRQF_TRIGGER_MASK) |
494 | && (new->flags & IRQF_TRIGGER_MASK) | 494 | && (new->flags & IRQF_TRIGGER_MASK) |