Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tracing: fix for tracepoint API change

Commit 38516ab59fbc5b3bb278cf5e1fe2867c70cff32e ("tracing: Let
tracepoints have data passed to tracepoint callbacks") requires this
fixup to the powerpc code.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Stephen Rothwell and committed by
Linus Torvalds
969ea5c5 043f275d

+5 -5
+5 -5
arch/powerpc/platforms/pseries/hvCall_inst.c
··· 102 102 #define CPU_NAME_BUF_SIZE 32 103 103 104 104 105 - static void probe_hcall_entry(unsigned long opcode, unsigned long *args) 105 + static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned long *args) 106 106 { 107 107 struct hcall_stats *h; 108 108 ··· 114 114 h->purr_start = mfspr(SPRN_PURR); 115 115 } 116 116 117 - static void probe_hcall_exit(unsigned long opcode, unsigned long retval, 117 + static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long retval, 118 118 unsigned long *retbuf) 119 119 { 120 120 struct hcall_stats *h; ··· 140 140 if (!firmware_has_feature(FW_FEATURE_LPAR)) 141 141 return 0; 142 142 143 - if (register_trace_hcall_entry(probe_hcall_entry)) 143 + if (register_trace_hcall_entry(probe_hcall_entry, NULL)) 144 144 return -EINVAL; 145 145 146 - if (register_trace_hcall_exit(probe_hcall_exit)) { 147 - unregister_trace_hcall_entry(probe_hcall_entry); 146 + if (register_trace_hcall_exit(probe_hcall_exit, NULL)) { 147 + unregister_trace_hcall_entry(probe_hcall_entry, NULL); 148 148 return -EINVAL; 149 149 } 150 150