2 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 3b04a0126121..ed0e0e90b3ef 100644
--- 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 5cbbc374e945..61d19e1b7a0b 100644
--- 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? */