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

Commit ddc86821 authored by Mark Brown's avatar Mark Brown Committed by Jason Cooper
Browse files

irqchip: gic-v3: Only define gic_peek_irq() when building SMP 



If building with CONFIG_SMP disbled (for example, with allnoconfig) then
GCC complains that the static function gic_peek_irq() is defined but not
used since the only reference is in the SMP initialisation code. Fix this
by moving the function definition inside the ifdef.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1406480224-24628-1-git-send-email-broonie@kernel.org


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 7d1311b9

drivers/irqchip/irq-gic-v3.c

+13 −13
Original line number Diff line number Diff line
@@ -200,19 +200,6 @@ static void gic_poke_irq(struct irq_data *d, u32 offset) 
	rwp_wait();

}



static int gic_peek_irq(struct irq_data *d, u32 offset)

{

	u32 mask = 1 << (gic_irq(d) % 32);

	void __iomem *base;



	if (gic_irq_in_rdist(d))

		base = gic_data_rdist_sgi_base();

	else

		base = gic_data.dist_base;



	return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);

}



static void gic_mask_irq(struct irq_data *d)

{

	gic_poke_irq(d, GICD_ICENABLER);
@@ -401,6 +388,19 @@ static void gic_cpu_init(void) 
}



#ifdef CONFIG_SMP

static int gic_peek_irq(struct irq_data *d, u32 offset)

{

	u32 mask = 1 << (gic_irq(d) % 32);

	void __iomem *base;



	if (gic_irq_in_rdist(d))

		base = gic_data_rdist_sgi_base();

	else

		base = gic_data.dist_base;



	return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);

}



static int gic_secondary_init(struct notifier_block *nfb,

			      unsigned long action, void *hcpu)

{