diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-14 14:12:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-14 14:12:31 +0100 |
| commit | 17452691b91bfb2c2d4fdb1ec2ae779ab146859e (patch) | |
| tree | 63477c90778aea357b4cdd6a1f1fbc6264f30ea8 | |
| parent | acaf699b4e42227a3e4d23ab0d33af02fa3f4fa0 (diff) | |
| parent | efd78e224ed02d4d1b40eca8fd07b78981c486b5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
| -rw-r--r-- | arch/arm64/kernel/smp.c | 3 | ||||
| -rw-r--r-- | include/trace/events/smp.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 5d54e3717bf..a28d2859932 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 diff --git a/include/trace/events/smp.h b/include/trace/events/smp.h index c8abfd74472..da0baf27a39 100644 --- a/include/trace/events/smp.h +++ b/include/trace/events/smp.h @@ -5,11 +5,10 @@ #define _TRACE_SMP_H #include <linux/tracepoint.h> -typedef void (*__smp_call_func_t)(void *info); DECLARE_EVENT_CLASS(smp_call_class, - TP_PROTO(__smp_call_func_t fnc), + TP_PROTO(void * fnc), TP_ARGS(fnc), @@ -35,7 +34,7 @@ DECLARE_EVENT_CLASS(smp_call_class, */ DEFINE_EVENT(smp_call_class, smp_call_func_entry, - TP_PROTO(__smp_call_func_t fnc), + TP_PROTO(void * fnc), TP_ARGS(fnc) ); @@ -51,7 +50,7 @@ DEFINE_EVENT(smp_call_class, smp_call_func_entry, */ DEFINE_EVENT(smp_call_class, smp_call_func_exit, - TP_PROTO(__smp_call_func_t fnc), + TP_PROTO(void * fnc), TP_ARGS(fnc) ); @@ -67,7 +66,7 @@ DEFINE_EVENT(smp_call_class, smp_call_func_exit, */ TRACE_EVENT(smp_call_func_send, - TP_PROTO(__smp_call_func_t func, int dest), + TP_PROTO(void * func, int dest), TP_ARGS(func, dest), |