From: tip-bot for Bruno Premont <bonbons@linux-vserver.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, bonbons@linux-vserver.org,
hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de
Subject: [tip:irq/urgent] genirq: Fix UP compile failure caused by irq_thread_check_affinity
Date: Wed, 22 Jul 2009 21:21:55 GMT [thread overview]
Message-ID: <tip-61f3826133dc07142935fb5712fc738e19eb5575@git.kernel.org> (raw)
In-Reply-To: <20090722222232.2eb3e1c4@neptune.home>
Commit-ID: 61f3826133dc07142935fb5712fc738e19eb5575
Gitweb: http://git.kernel.org/tip/61f3826133dc07142935fb5712fc738e19eb5575
Author: Bruno Premont <bonbons@linux-vserver.org>
AuthorDate: Wed, 22 Jul 2009 22:22:32 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
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 ]
Signed-off-by: Bruno Premont <bonbons@linux-vserver.org>
LKML-Reference: <20090722222232.2eb3e1c4@neptune.home>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
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 f0de36f..61c679d 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -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
prev parent reply other threads:[~2009-07-22 21:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-22 20:22 [Patch] Fix compile failure after genirq: Delegate irq affinity setting to the irq thread Bruno Prémont
2009-07-22 21:07 ` Thomas Gleixner
2009-07-22 21:21 ` tip-bot for Bruno Premont [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-61f3826133dc07142935fb5712fc738e19eb5575@git.kernel.org \
--to=bonbons@linux-vserver.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®