Merge tag 'v3.16-rc6' into next

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

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c7463aa..99b0b09 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -92,7 +92,6 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = {
 
 void __init init_IRQ(void)
 {
-       irq_reserve_irqs(0, THIN_INTERRUPT);
        init_cio_interrupts();
        init_airq_interrupts();
        init_ext_interrupts();
@@ -151,9 +150,9 @@ out:
        return 0;
 }
 
-int arch_show_interrupts(struct seq_file *p, int prec)
+unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
-       return 0;
+       return from < THIN_INTERRUPT ? THIN_INTERRUPT : from;
 }
 
 /*