diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-18 17:52:53 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-03-18 17:52:53 +0100 |
| commit | df43b86b411dcc1e6ddbd9b7a44357c28d523bad (patch) | |
| tree | b89cf0273cb61a4ff66747854696b44fc54956fe | |
| parent | MN10300: Select HAVE_GENERIC_HARDIRQS rather than GENERIC_HARDIRQS (diff) | |
| download | linux-df43b86b411dcc1e6ddbd9b7a44357c28d523bad.tar.xz linux-df43b86b411dcc1e6ddbd9b7a44357c28d523bad.zip | |
MN10300: Select GENERIC_HARDIRQS_NO_DEPRECATED
All chips converted.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/mn10300/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mn10300/kernel/cevt-mn10300.c | 6 | ||||
| -rw-r--r-- | arch/mn10300/kernel/irq.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index e207701c2590..10971be43061 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -2,6 +2,7 @@ config MN10300 def_bool y select HAVE_OPROFILE select HAVE_GENERIC_HARDIRQS + select GENERIC_HARDIRQS_NO_DEPRECATED config AM33_2 def_bool n diff --git a/arch/mn10300/kernel/cevt-mn10300.c b/arch/mn10300/kernel/cevt-mn10300.c index 9eb387adea7c..69cae0260786 100644 --- a/arch/mn10300/kernel/cevt-mn10300.c +++ b/arch/mn10300/kernel/cevt-mn10300.c @@ -111,9 +111,9 @@ int __init init_clockevents(void) #if defined(CONFIG_SMP) && !defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) /* setup timer irq affinity so it only runs on this cpu */ { - struct irq_desc *desc; - desc = irq_to_desc(cd->irq); - cpumask_copy(desc->affinity, cpumask_of(cpu)); + struct irq_data *data; + data = irq_get_irq_data(cd->irq); + cpumask_copy(data->affinity, cpumask_of(cpu)); iact->flags |= IRQF_NOBALANCING; } #endif diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c index cd36a6c62770..f09fed5e6afc 100644 --- a/arch/mn10300/kernel/irq.c +++ b/arch/mn10300/kernel/irq.c @@ -363,12 +363,12 @@ int show_interrupts(struct seq_file *p, void *v) if (i < NR_CPU_IRQS) seq_printf(p, " %14s.%u", - irq_desc[i].chip->name, + irq_desc[i].irq_data.chip->name, (GxICR(i) & GxICR_LEVEL) >> GxICR_LEVEL_SHIFT); else seq_printf(p, " %14s", - irq_desc[i].chip->name); + irq_desc[i].irq_data.chip->name); seq_printf(p, " %s", action->name); |