tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
xtensa: Fixup irq conversion fallout and nmi_count
Some unnamed moron fatfingered the arguments of the irq chip callbacks
to irq_chip instead of irq_data.
While at it remove the nmi_count() print in arch_show_interrupts()
which has been broken before the irq conversion already.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+6
-12
+6
-12
arch/xtensa/kernel/irq.c
+6
-12
arch/xtensa/kernel/irq.c
···
64
64
65
65
int arch_show_interrupts(struct seq_file *p, int prec)
66
66
{
67
-
int j;
68
-
69
-
seq_printf(p, "%*s: ", prec, "NMI");
70
-
for_each_online_cpu(j)
71
-
seq_printf(p, "%10u ", nmi_count(j));
72
-
seq_putc(p, '\n');
73
67
seq_printf(p, "%*s: ", prec, "ERR");
74
68
seq_printf(p, "%10u\n", atomic_read(&irq_err_count));
75
69
return 0;
76
70
}
77
71
78
-
static void xtensa_irq_mask(struct irq_chip *d)
72
+
static void xtensa_irq_mask(struct irq_data *d)
79
73
{
80
74
cached_irq_mask &= ~(1 << d->irq);
81
75
set_sr (cached_irq_mask, INTENABLE);
82
76
}
83
77
84
-
static void xtensa_irq_unmask(struct irq_chip *d)
78
+
static void xtensa_irq_unmask(struct irq_data *d)
85
79
{
86
80
cached_irq_mask |= 1 << d->irq;
87
81
set_sr (cached_irq_mask, INTENABLE);
88
82
}
89
83
90
-
static void xtensa_irq_enable(struct irq_chip *d)
84
+
static void xtensa_irq_enable(struct irq_data *d)
91
85
{
92
86
variant_irq_enable(d->irq);
93
87
xtensa_irq_unmask(d->irq);
94
88
}
95
89
96
-
static void xtensa_irq_disable(struct irq_chip *d)
90
+
static void xtensa_irq_disable(struct irq_data *d)
97
91
{
98
92
xtensa_irq_mask(d->irq);
99
93
variant_irq_disable(d->irq);
100
94
}
101
95
102
-
static void xtensa_irq_ack(struct irq_chip *d)
96
+
static void xtensa_irq_ack(struct irq_data *d)
103
97
{
104
98
set_sr(1 << d->irq, INTCLEAR);
105
99
}
106
100
107
-
static int xtensa_irq_retrigger(struct irq_chip *d)
101
+
static int xtensa_irq_retrigger(struct irq_data *d)
108
102
{
109
103
set_sr (1 << d->irq, INTSET);
110
104
return 1;