3 files changed, 8 insertions, 8 deletions

diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 95b7491196aa..ac4d9d4a1ebf 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -354,15 +354,15 @@ TRACE_EVENT(rcu_unlock_preempted_task,
  */
 TRACE_EVENT(rcu_quiescent_state_report,
 
-        TP_PROTO(const char *rcuname, unsigned long gpnum,
+        TP_PROTO(const char *rcuname, unsigned long gp_seq,
                  unsigned long mask, unsigned long qsmask,
                  u8 level, int grplo, int grphi, int gp_tasks),
 
-        TP_ARGS(rcuname, gpnum, mask, qsmask, level, grplo, grphi, gp_tasks),
+        TP_ARGS(rcuname, gp_seq, mask, qsmask, level, grplo, grphi, gp_tasks),
 
         TP_STRUCT__entry(
                 __field(const char *, rcuname)
-                __field(unsigned long, gpnum)
+                __field(unsigned long, gp_seq)
                 __field(unsigned long, mask)
                 __field(unsigned long, qsmask)
                 __field(u8, level)
@@ -373,7 +373,7 @@ TRACE_EVENT(rcu_quiescent_state_report,
 
         TP_fast_assign(
                 __entry->rcuname = rcuname;
-                __entry->gpnum = gpnum;
+                __entry->gp_seq = gp_seq;
                 __entry->mask = mask;
                 __entry->qsmask = qsmask;
                 __entry->level = level;
@@ -383,7 +383,7 @@ TRACE_EVENT(rcu_quiescent_state_report,
         ),
 
         TP_printk("%s %lu %lx>%lx %u %d %d %u",
-                  __entry->rcuname, __entry->gpnum,
+                  __entry->rcuname, __entry->gp_seq,
                   __entry->mask, __entry->qsmask, __entry->level,
                   __entry->grplo, __entry->grphi, __entry->gp_tasks)
 );
@@ -763,7 +763,7 @@ TRACE_EVENT(rcu_barrier,
 #define trace_rcu_nocb_wake(rcuname, cpu, reason) do { } while (0)
 #define trace_rcu_preempt_task(rcuname, pid, gp_seq) do { } while (0)
 #define trace_rcu_unlock_preempted_task(rcuname, gp_seq, pid) do { } while (0)
-#define trace_rcu_quiescent_state_report(rcuname, gpnum, mask, qsmask, level, \
+#define trace_rcu_quiescent_state_report(rcuname, gp_seq, mask, qsmask, level, \
                                          grplo, grphi, gp_tasks) do { } \
         while (0)
 #define trace_rcu_fqs(rcuname, gpnum, cpu, qsevent) do { } while (0)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 066dbaacec30..7c6c11d5479c 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -2229,7 +2229,7 @@ rcu_report_qs_rnp(unsigned long mask, struct rcu_state *rsp,
                 WARN_ON_ONCE(!rcu_is_leaf_node(rnp) &&
                              rcu_preempt_blocked_readers_cgp(rnp));
                 rnp->qsmask &= ~mask;
-                trace_rcu_quiescent_state_report(rsp->name, rnp->gpnum,
+                trace_rcu_quiescent_state_report(rsp->name, rnp->gp_seq,
                                                  mask, rnp->qsmask, rnp->level,
                                                  rnp->grplo, rnp->grphi,
                                                  !!rnp->gp_tasks);
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index a10b0e26ce19..c8a2c7760121 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -566,7 +566,7 @@ void rcu_read_unlock_special(struct task_struct *t)
                 empty_exp_now = sync_rcu_preempt_exp_done(rnp);
                 if (!empty_norm && !rcu_preempt_blocked_readers_cgp(rnp)) {
                         trace_rcu_quiescent_state_report(TPS("preempt_rcu"),
-                                                         rnp->gpnum,
+                                                         rnp->gp_seq,
                                                          0, rnp->qsmask,
                                                          rnp->level,
                                                          rnp->grplo,