github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Browse Source
This commit is contained in:
Mark Brown 2013-10-14 14:12:31 +01:00
commit 17452691b9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/kernel/smp.c
View File

@ -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

9
include/trace/events/smp.h
View File

@ -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),