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

Commit a184651a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "irqchip: gic: Fix msm_show_resume_irq for 64-bit"

parents fde7d8f0 0b204ce9

drivers/irqchip/irq-gic.c

+4 −4
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void gic_show_resume_irq(struct gic_chip_data *gic) 
{

	unsigned int i;

	u32 enabled;

	unsigned long pending[32];

	u32 pending[32];

	void __iomem *base = gic_data_dist_base(gic);



	if (!msm_show_resume_irq_mask)
@@ -273,9 +273,9 @@ static void gic_show_resume_irq(struct gic_chip_data *gic) 
	}

	raw_spin_unlock(&irq_controller_lock);



	for (i = find_first_bit(pending, gic->gic_irqs);

	for (i = find_first_bit((unsigned long *)pending, gic->gic_irqs);

	i < gic->gic_irqs;

	     i = find_next_bit(pending, gic->gic_irqs, i+1)) {

	i = find_next_bit((unsigned long *)pending, gic->gic_irqs, i+1)) {

		struct irq_desc *desc = irq_to_desc(i + gic->irq_offset);

		const char *name = "null";