Fix compile failure after genirq: Delegate irq affinity setting to the irq thread
PATCH 1/1 Fix compile failure after genirq: Delegate irq affinity setting to the irq thread
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.
---
kernel/irq/manage.c +4 -0
@@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action)return -1 ; } +#ifdef CONFIG_SMP /* * Check whether we need to change the affinity of the interrupt thread. */
@@ -478,6 +479,12 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)set_cpus_allowed_ptr (current, mask);free_cpumask_var (mask); } +#else +static inline void +irq_thread_check_affinity(struct irq_desc *desc, struct irqaction
*action) +{
+}
+#endif
/*
* Interrupt handler thread
---
Alternative patch which moves the new function irq_thread_check_affinity() around so it is covered by already existing #ifdef CONFIG_SMP.
---
kernel/irq/manage.c +33 -28
78 lines not on this page · raw message
Quoted 10 lines · Bruno Prémont
Since genirq: Delegate irq affinity setting to the irq thread (
591d2fb02ea80472d846c0b8507007806bdd69cc) compilation withCONFIG_SMP=nfails 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: 'structirq_desc' has no member named 'affinity'
make[4]: *** [kernel/irq/manage.o] Error 1
Quoted 5 lines
That commit adds a new function
irq_thread_check_affinity()which uses struct irq_desc.affinity which is only available forCONFIG_SMP=y. Move that function under #ifdefCONFIG_SMP.Signed-off-by Bruno Prémont <[email protected]>
Darn. My bad. I was too focussed to get that problem solved :(
Thanks,
tglx
[tip:irq/urgent] genirq: Fix UP compile failure caused by irq_thread_check_affinity
In reply to Bruno PrémontCommit-ID: 61f3826133dc07142935fb5712fc738e19eb5575 Gitweb: http://git.kernel.org/tip/61f3826133dc07142935fb5712fc738e19eb5575 Author: Bruno Premont <[email protected]> AuthorDate: Wed, 22 Jul 2009 22:22:32 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 22 Jul 2009 23:18:46 +0200
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 ]
LKML-Reference: <[email protected]>
--- kernel/irq/manage.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
kernel/irq/manage.c +5 -0
@@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action)return -1 ; } +#ifdef CONFIG_SMP /* * Check whether we need to change the affinity of the interrupt thread. */
@@ -478,6 +479,10 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)set_cpus_allowed_ptr (current, mask); free_cpumask_var(mask); } +#else +static inline void +irq_thread_check_affinity (struct irq_desc *desc,struct irqaction *action) { } +#endif /* * Interrupt handler thread