Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 969ea5c5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

tracing: fix for tracepoint API change 



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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 043f275d

arch/powerpc/platforms/pseries/hvCall_inst.c

+5 −5
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 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 *ignored, unsigned long opcode, unsigned long *args)

{

	struct hcall_stats *h;
@@ -114,7 +114,7 @@ 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,

static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long retval,

			     unsigned long *retbuf)

{

	struct hcall_stats *h;
@@ -140,11 +140,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;

	}