Skip to content

Commit

Permalink
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/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
  • Loading branch information
Linus Torvalds committed Dec 2, 2013
2 parents a0b57ca + 08332df commit a45299e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions drivers/irqchip/irq-gic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
set_smp_cross_call(gic_raise_softirq);
register_cpu_notifier(&gic_cpu_notifier);
#endif

set_handle_irq(gic_handle_irq);
set_handle_irq(gic_handle_irq);
}

gic_chip.flags |= gic_arch_extn.flags;
gic_dist_init(gic);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/irqreturn.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion kernel/irq/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a45299e

Please sign in to comment.