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

Commit a50445d7 authored by Pekka Paalanen's avatar Pekka Paalanen Committed by Thomas Gleixner
Browse files

mmiotrace: rename kmmio_probe::user_data to :private. 



Signed-off-by: default avatarPekka Paalanen <pq@iki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent dee310d0

arch/x86/mm/mmio-mod.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -191,7 +191,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs, 
	struct mmiotrace_rw *my_trace = &get_cpu_var(cpu_trace);

	struct mmiotrace_rw *my_trace = &get_cpu_var(cpu_trace);

	const unsigned long instptr = instruction_pointer(regs);

	const unsigned long instptr = instruction_pointer(regs);

	const enum reason_type type = get_ins_type(instptr);

	const enum reason_type type = get_ins_type(instptr);

	struct remap_trace *trace = p->user_data;

	struct remap_trace *trace = p->private;





	/* it doesn't make sense to have more than one active trace per cpu */

	/* it doesn't make sense to have more than one active trace per cpu */

	if (my_reason->active_traces)

	if (my_reason->active_traces)
@@ -299,7 +299,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size, 
			.len = size,

			.len = size,

			.pre_handler = pre,

			.pre_handler = pre,

			.post_handler = post,

			.post_handler = post,

			.user_data = trace

			.private = trace

		},

		},

		.phys = offset,

		.phys = offset,

		.id = atomic_inc_return(&next_id)

		.id = atomic_inc_return(&next_id)

include/linux/mmiotrace.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ struct kmmio_probe { 
	unsigned long len; /* length of the probe region */

	unsigned long len; /* length of the probe region */

	kmmio_pre_handler_t pre_handler; /* Called before addr is executed. */

	kmmio_pre_handler_t pre_handler; /* Called before addr is executed. */

	kmmio_post_handler_t post_handler; /* Called after addr is executed */

	kmmio_post_handler_t post_handler; /* Called after addr is executed */

	void *user_data;

	void *private;

};

};





/* kmmio is active by some kmmio_probes? */

/* kmmio is active by some kmmio_probes? */