Skip to content

Commit 61f3826

Browse files
Bruno PremontKAGA-KOKO
authored andcommitted
genirq: Fix UP compile failure caused by irq_thread_check_affinity
Since genirq: Delegate irq affinity setting to the irq thread (591d2fb) compilation with CONFIG_SMP=n fails with following error: /usr/src/linux-2.6/kernel/irq/manage.c: In function 'irq_thread_check_affinity': /usr/src/linux-2.6/kernel/irq/manage.c:475: error: 'struct irq_desc' has no member named 'affinity' make[4]: *** [kernel/irq/manage.o] Error 1 That commit adds a new function irq_thread_check_affinity() which uses struct irq_desc.affinity which is only available for CONFIG_SMP=y. Move that function under #ifdef CONFIG_SMP. [ tglx@brownpaperbag: compile and boot tested on UP and SMP ] Signed-off-by: Bruno Premont <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 3c33010 commit 61f3826

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)