tracing, powerpc: Add data parameter to powerpc-specific tracepoints
PATCH 1/1 tracing, powerpc: Add data parameter to powerpc-specific tracepoints
Commit 38516ab5 ("tracing: Let tracepoints have data passed to tracepoint callbacks") added a void *data parameter to tracing callbacks and to the {un,}register_trace_* functions, requiring all tracepoint callback functions to have the extra void * parameter.
This adds the void *data parameter to the tracepoints in the pSeries hypervisor call code. Without this, hvCall_inst.c fails to compile with tracing enabled.
--- arch/powerpc/platforms/pseries/hvCall_inst.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/powerpc/platforms/pseries/hvCall_inst.c +7 -6
@@ -102,7 +102,8 @@ static const struct file_operations hcall_inst_seq_fops = {#define CPU_NAME_BUF_SIZE 32 -static void probe_hcall_entry (unsigned long opcode,unsigned long *args) +static void probe_hcall_entry (void *data,unsigned long opcode, +unsigned long *args) {struct hcall_stats *h;
@@ -114,8 +115,8 @@ static void probe_hcall_entry(unsigned long opcode, unsigned long *args) h->purr_start =mfspr (SPRN_PURR ); } -static void probe_hcall_exit (unsigned long opcode,unsigned long retval, -unsigned long *retbuf) +static void probe_hcall_exit (void *data,unsigned long opcode, +unsigned long retval,unsigned long *retbuf) {struct hcall_stats *h;
@@ -140,11 +141,11 @@ static int __init hcall_inst_init(void)if (!firmware_has_feature (FW_FEATURE_LPAR ))return 0 ; -if (register_trace_hcall_entry (probe_hcall_entry)) +if (register_trace_hcall_entry (probe_hcall_entry,NULL ))return -EINVAL ; -if (register_trace_hcall_exit (probe_hcall_exit)) { -unregister_trace_hcall_entry (probe_hcall_entry); +if (register_trace_hcall_exit (probe_hcall_exit,NULL )) { +unregister_trace_hcall_entry (probe_hcall_entry,NULL );return -EINVAL ; }
Quoted 9 lines · Paul Mackerras
Commit
38516ab5("tracing: Let tracepoints have data passed to tracepoint callbacks") added a void *data parameter to tracing callbacks and to the {un,}register_trace_* functions, requiring all tracepoint callback functions to have the extra void * parameter.This adds the void *data parameter to the tracepoints in the pSeries hypervisor call code. Without this,
hvCall_inst.cfails to compile with tracing enabled.
Thanks!
-- Steve
Quoted 12 lines
Signed-off-by Paul Mackerras <[email protected]>--- arch/powerpc/platforms/pseries/hvCall_inst.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)arch/powerpc/platforms/pseries/hvCall_inst.c +0
-0@@ -102,7 +102,8 @@ static const struct file_operations hcall_inst_seq_fops = {#define CPU_NAME_BUF_SIZE 32