From: Thomas Gleixner <tglx@linutronix.de>
To: linux-alpha@vger.kernel.org
Cc: Kyle McMartin <kyle@redhat.com>, Matt Turner <mattst88@gmail.com>
Subject: [patch 18/19] alpha: irq: Convert affinity to use irq_data
Date: Sun, 06 Feb 2011 14:33:00 -0000 [thread overview]
Message-ID: <20110206143149.613660661@linutronix.de> (raw)
In-Reply-To: 20110206143037.124533892@linutronix.de
[-- Attachment #1: alpha-irq-convert-to-irq-data.patch --]
[-- Type: text/plain, Size: 1298 bytes --]
affinity is moving to irq_data. Fix it up.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/alpha/kernel/irq.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
Index: linux-next/arch/alpha/kernel/irq.c
===================================================================
--- linux-next.orig/arch/alpha/kernel/irq.c
+++ linux-next/arch/alpha/kernel/irq.c
@@ -44,11 +44,16 @@ static char irq_user_affinity[NR_IRQS];
int irq_select_affinity(unsigned int irq)
{
- struct irq_desc *desc = irq_to_desc(irq);
+ struct irq_data *data = irq_get_irq_data(irq);
+ struct irq_chip *chip;
static int last_cpu;
int cpu = last_cpu + 1;
- if (!desc || !get_irq_desc_chip(desc)->set_affinity || irq_user_affinity[irq])
+ if (!data)
+ return 1;
+ chip = irq_data_get_irq_chip(data);
+
+ if (!chip->irq_set_affinity || irq_user_affinity[irq])
return 1;
while (!cpu_possible(cpu) ||
@@ -56,8 +61,8 @@ int irq_select_affinity(unsigned int irq
cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
last_cpu = cpu;
- cpumask_copy(desc->affinity, cpumask_of(cpu));
- get_irq_desc_chip(desc)->set_affinity(irq, cpumask_of(cpu));
+ cpumask_copy(data->affinity, cpumask_of(cpu));
+ chip->irq_set_affinity(data, cpumask_of(cpu), false);
return 0;
}
#endif /* CONFIG_SMP */
next prev parent reply other threads:[~2011-02-06 14:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 14:32 [patch 00/19] Bugfix and irq_chip conversion Thomas Gleixner
2011-02-06 14:32 ` [patch 01/19] alpha: Fix broken SMP=y Thomas Gleixner
2011-02-06 14:32 ` [patch 02/19] alpha: Pyxis convert irq_chip functions Thomas Gleixner
2011-02-06 14:32 ` [patch 03/19] alpha: srm: Convert " Thomas Gleixner
2011-02-06 14:32 ` [patch 04/19] alpha: i8259, alcor, jensen wildfire: Convert irq_chip Thomas Gleixner
2011-02-06 14:32 ` [patch 05/19] alpha: cabriolet: Convert irq_chip functions Thomas Gleixner
2011-02-06 14:32 ` [patch 06/19] alpha: dp264: " Thomas Gleixner
2011-02-06 14:32 ` [patch 07/19] alpha: eb64p: " Thomas Gleixner
2011-02-06 14:32 ` [patch 08/19] alpha: eiger: " Thomas Gleixner
2011-02-06 14:32 ` [patch 09/19] alpha: marvel: " Thomas Gleixner
2011-02-06 14:32 ` [patch 10/19] alpha: mikasa: " Thomas Gleixner
2011-02-06 14:32 ` [patch 11/19] alpha: rawhide: " Thomas Gleixner
2011-02-06 14:32 ` [patch 12/19] alpha: noritake: " Thomas Gleixner
2011-02-06 14:32 ` [patch 13/19] alpha: rx164: " Thomas Gleixner
2011-02-06 14:32 ` [patch 14/19] alpha: sable: " Thomas Gleixner
2011-02-06 14:32 ` [patch 15/19] alpha: takara: " Thomas Gleixner
2011-02-06 14:32 ` [patch 16/19] alpha: titan: " Thomas Gleixner
2011-02-23 21:30 ` Matt Turner
2011-02-23 22:03 ` Thomas Gleixner
2011-02-06 14:32 ` [patch 17/19] alpha: irq: Remove pointless irq status manipulation Thomas Gleixner
2011-02-06 14:33 ` Thomas Gleixner [this message]
2011-02-06 14:33 ` [patch 19/19] alpha: Enable GENERIC_HARDIRQS_NO_DEPRECATED Thomas Gleixner
2011-02-23 21:17 ` [patch 00/19] Bugfix and irq_chip conversion Matt Turner
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=20110206143149.613660661@linutronix.de \
--to=tglx@linutronix.de \
--cc=kyle@redhat.com \
--cc=linux-alpha@vger.kernel.org \
--cc=mattst88@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).