Hi Mark,
I'm not really comfortable with this. Given the fact that we haven't tested on AArch64 at all, I'm a bit reluctant to ACK this.
What about this for a change?
-8<--------------------------------------------------------------------------
GIC: enable ipi raise/start/end tracing only for ARM
Commit 2353c1f800 (arm: ipi raise/start/end tracing) added tracepoints for IPIs in the generic GIC driver but only added definitions for them on ARM, causing build failures on ARM64. Fix this by restricting its use only on ARM architecture.
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com -- drivers/irqchip/irq-gic.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 65bc837..2171198 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -41,7 +41,9 @@ #include <linux/slab.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqchip/arm-gic.h> +#ifdef CONFIG_ARM #include <trace/events/arm-ipi.h> +#endif
#include <asm/irq.h> #include <asm/exception.h> @@ -658,7 +660,9 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
/* Convert our logical CPU mask into a physical one. */ for_each_cpu(cpu, mask) { +#ifdef CONFIG_ARM trace_arm_ipi_send(irq, cpu); +#endif map |= gic_cpu_map[cpu]; }
-- 1.8.4
-8<---------------------------------------------------------------------------
Best regards, Liviu
On Mon, Oct 14, 2013 at 01:38:52PM +0100, Mark Brown wrote:
From: Mark Brown broonie@linaro.org
Commit 2353c1f800 (arm: ipi raise/start/end tracing) added tracepoints for IPIs in the generic GIC driver but only added definitions for them on ARM, causing build failures on ARM64. Fix this by adding equivalent definitions for arm64.
Signed-off-by: Mark Brown broonie@linaro.org
arch/arm64/kernel/smp.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 5d54e37..a28d285 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -48,6 +48,9 @@ #include <asm/tlbflush.h> #include <asm/ptrace.h> +#define CREATE_TRACE_POINTS +#include <trace/events/arm-ipi.h>
/*
- as from 2.5, kernels no longer have an init_tasks structure
- so we need some other way of telling a new secondary core
-- 1.8.4.rc3