Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sparc-for-6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc
Pull sparc updates from Andreas Larsson:
- Improve performance for reading /proc/interrupts
- Simplify irq code for sun4v
- Replace zero-length array with flexible array in struct for pci for
sparc64
* tag 'sparc-for-6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs()
sparc/irq: Use str_enabled_disabled() helper function
sparc: replace zero-length array with flexible-array member
sparc/irq: use seq_put_decimal_ull_width() for decimal values
+12
-13
+6
-6
arch/sparc/kernel/irq_32.c
+6
-6
arch/sparc/kernel/irq_32.c
···
199
199
int j;
200
200
201
201
#ifdef CONFIG_SMP
202
-
seq_printf(p, "RES: ");
202
+
seq_printf(p, "RES:");
203
203
for_each_online_cpu(j)
204
-
seq_printf(p, "%10u ", cpu_data(j).irq_resched_count);
204
+
seq_put_decimal_ull_width(p, " ", cpu_data(j).irq_resched_count, 10);
205
205
seq_printf(p, " IPI rescheduling interrupts\n");
206
-
seq_printf(p, "CAL: ");
206
+
seq_printf(p, "CAL:");
207
207
for_each_online_cpu(j)
208
-
seq_printf(p, "%10u ", cpu_data(j).irq_call_count);
208
+
seq_put_decimal_ull_width(p, " ", cpu_data(j).irq_call_count, 10);
209
209
seq_printf(p, " IPI function call interrupts\n");
210
210
#endif
211
-
seq_printf(p, "NMI: ");
211
+
seq_printf(p, "NMI:");
212
212
for_each_online_cpu(j)
213
-
seq_printf(p, "%10u ", cpu_data(j).counter);
213
+
seq_put_decimal_ull_width(p, " ", cpu_data(j).counter, 10);
214
214
seq_printf(p, " Non-maskable interrupts\n");
215
215
return 0;
216
216
}
+5
-6
arch/sparc/kernel/irq_64.c
+5
-6
arch/sparc/kernel/irq_64.c
···
22
22
#include <linux/seq_file.h>
23
23
#include <linux/ftrace.h>
24
24
#include <linux/irq.h>
25
+
#include <linux/string_choices.h>
25
26
26
27
#include <asm/ptrace.h>
27
28
#include <asm/processor.h>
···
146
145
*/
147
146
static bool sun4v_cookie_only_virqs(void)
148
147
{
149
-
if (hv_irq_version >= 3)
150
-
return true;
151
-
return false;
148
+
return hv_irq_version >= 3;
152
149
}
153
150
154
151
static void __init irq_init_hv(void)
···
169
170
170
171
pr_info("SUN4V: Using IRQ API major %d, cookie only virqs %s\n",
171
172
hv_irq_version,
172
-
sun4v_cookie_only_virqs() ? "enabled" : "disabled");
173
+
str_enabled_disabled(sun4v_cookie_only_virqs()));
173
174
}
174
175
175
176
/* This function is for the timer interrupt.*/
···
303
304
{
304
305
int j;
305
306
306
-
seq_printf(p, "NMI: ");
307
+
seq_printf(p, "NMI:");
307
308
for_each_online_cpu(j)
308
-
seq_printf(p, "%10u ", cpu_data(j).__nmi_count);
309
+
seq_put_decimal_ull_width(p, " ", cpu_data(j).__nmi_count, 10);
309
310
seq_printf(p, " Non-maskable interrupts\n");
310
311
return 0;
311
312
}