Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[cascardo/linux.git] / arch / s390 / kernel / irq.c

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c373a1d..285d656 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -127,9 +127,7 @@ int show_interrupts(struct seq_file *p, void *v)
                        seq_printf(p, "CPU%d       ", cpu);
                seq_putc(p, '\n');
        }
-       if (index < NR_IRQS) {
-               if (index >= NR_IRQS_BASE)
-                       goto out;
+       if (index < NR_IRQS_BASE) {
                seq_printf(p, "%s: ", irqclass_main_desc[index].name);
                irq = irqclass_main_desc[index].irq;
                for_each_online_cpu(cpu)
@@ -137,6 +135,9 @@ int show_interrupts(struct seq_file *p, void *v)
                seq_putc(p, '\n');
                goto out;
        }
+       if (index > NR_IRQS_BASE)
+               goto out;
+
        for (index = 0; index < NR_ARCH_IRQS; index++) {
                seq_printf(p, "%s: ", irqclass_sub_desc[index].name);
                irq = irqclass_sub_desc[index].irq;