mmiotrace: rename kmmio_probe::user_data to :private.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 3b04a01261216489993283f54a8aa308d1c14ada..ed0e0e90b3ef20a2f9c4f0611a87846bf565004e 100644 (file)
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -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);
        const unsigned long instptr = instruction_pointer(regs);
        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 */
        if (my_reason->active_traces)
@@ -299,7 +299,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
                        .len = size,
                        .pre_handler = pre,
                        .post_handler = post,
-                       .user_data = trace
+                       .private = trace
                },
                .phys = offset,
                .id = atomic_inc_return(&next_id)

diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index 5cbbc374e9450f202bf3dd4b0bf7b5b127f1ea92..61d19e1b7a0b0684ec6799b1d2351e167f10a1ae 100644 (file)
--- a/include/linux/mmiotrace.h
+++ b/include/linux/mmiotrace.h
@@ -18,7 +18,7 @@ struct kmmio_probe {
        unsigned long len; /* length of the probe region */
        kmmio_pre_handler_t pre_handler; /* Called before 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? */