Skip to content

Commit b600ffa

Browse files
committed
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix UP compile failure caused by irq_thread_check_affinity
2 parents 81cbf6d + 61f3826 commit b600ffa

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

kernel/irq/manage.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action)
451451
return -1;
452452
}
453453

454+
#ifdef CONFIG_SMP
454455
/*
455456
* Check whether we need to change the affinity of the interrupt thread.
456457
*/
@@ -478,6 +479,10 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
478479
set_cpus_allowed_ptr(current, mask);
479480
free_cpumask_var(mask);
480481
}
482+
#else
483+
static inline void
484+
irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) { }
485+
#endif
481486

482487
/*
483488
* Interrupt handler thread

0 commit comments

Comments
 (0)