diff options
author | Bruno Premont <bonbons@linux-vserver.org> | 2009-07-22 16:22:32 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-07-22 17:18:46 -0400 |
commit | 61f3826133dc07142935fb5712fc738e19eb5575 (patch) | |
tree | 2bac9166734e564a4f89d9db9d7498df87597c31 /kernel/irq | |
parent | 3c3301083e3bea4d14c597106c7b20b4b85fc03d (diff) |
genirq: Fix UP compile failure caused by irq_thread_check_affinity
Since genirq: Delegate irq affinity setting to the irq thread
(591d2fb02ea80472d846c0b8507007806bdd69cc) 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 <bonbons@linux-vserver.org>
LKML-Reference: <20090722222232.2eb3e1c4@neptune.home>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index f0de36f13a44..61c679db4687 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action) | |||
451 | return -1; | 451 | return -1; |
452 | } | 452 | } |
453 | 453 | ||
454 | #ifdef CONFIG_SMP | ||
454 | /* | 455 | /* |
455 | * Check whether we need to change the affinity of the interrupt thread. | 456 | * Check whether we need to change the affinity of the interrupt thread. |
456 | */ | 457 | */ |
@@ -478,6 +479,10 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) | |||
478 | set_cpus_allowed_ptr(current, mask); | 479 | set_cpus_allowed_ptr(current, mask); |
479 | free_cpumask_var(mask); | 480 | free_cpumask_var(mask); |
480 | } | 481 | } |
482 | #else | ||
483 | static inline void | ||
484 | irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) { } | ||
485 | #endif | ||
481 | 486 | ||
482 | /* | 487 | /* |
483 | * Interrupt handler thread | 488 | * Interrupt handler thread |