Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45299e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 - Correction of fuzzy and fragile IRQ_RETVAL macro
 - IRQ related resume fix affecting only XEN
 - ARM/GIC fix for chained GIC controllers

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Gic: fix boot for chained gics
  irq: Enable all irqs unconditionally in irq_resume
  genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
parents a0b57ca3 08332dff

drivers/irqchip/irq-gic.c

+5 −4
Original line number Diff line number Diff line
@@ -957,12 +957,13 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start, 
	if (WARN_ON(!gic->domain))

		return;



	if (gic_nr == 0) {

#ifdef CONFIG_SMP

		set_smp_cross_call(gic_raise_softirq);

		register_cpu_notifier(&gic_cpu_notifier);

#endif



		set_handle_irq(gic_handle_irq);

	}



	gic_chip.flags |= gic_arch_extn.flags;

	gic_dist_init(gic);

include/linux/irqreturn.h

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ enum irqreturn { 
};



typedef enum irqreturn irqreturn_t;

#define IRQ_RETVAL(x)	((x) != IRQ_NONE)

#define IRQ_RETVAL(x)	((x) ? IRQ_HANDLED : IRQ_NONE)



#endif

kernel/irq/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void resume_irqs(bool want_early) 
		bool is_early = desc->action &&

			desc->action->flags & IRQF_EARLY_RESUME;



		if (is_early != want_early)

		if (!is_early && want_early)

			continue;



		raw_spin_lock_irqsave(&desc->lock, flags);