3 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/tick.h b/include/linux/tick.h
index ab8be90b5cc..f37fceb69b7 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -31,10 +31,10 @@ enum tick_nohz_mode {
  * struct tick_sched - sched tick emulation and no idle tick control/stats
  * @sched_timer:        hrtimer to schedule the periodic tick in high
  *                      resolution mode
- * @idle_tick:          Store the last idle tick expiry time when the tick
- *                      timer is modified for idle sleeps. This is necessary
+ * @last_tick:          Store the last tick expiry time when the tick
+ *                      timer is modified for nohz sleeps. This is necessary
  *                      to resume the tick timer operation in the timeline
- *                      when the CPU returns from idle
+ *                      when the CPU returns from nohz sleep.
  * @tick_stopped:       Indicator that the idle tick has been stopped
  * @idle_jiffies:       jiffies at the entry to idle for idle time accounting
  * @idle_calls:         Total number of idle calls
@@ -51,7 +51,7 @@ struct tick_sched {
         struct hrtimer                  sched_timer;
         unsigned long                   check_clocks;
         enum tick_nohz_mode             nohz_mode;
-        ktime_t                         idle_tick;
+        ktime_t                         last_tick;
         int                             inidle;
         int                             tick_stopped;
         unsigned long                   idle_jiffies;
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 911834b33b8..73cc4901336 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -400,7 +400,7 @@ static void tick_nohz_stop_sched_tick(struct tick_sched *ts, ktime_t now)
                 if (!ts->tick_stopped) {
                         select_nohz_load_balancer(1);
 
-                        ts->idle_tick = hrtimer_get_expires(&ts->sched_timer);
+                        ts->last_tick = hrtimer_get_expires(&ts->sched_timer);
                         ts->tick_stopped = 1;
                 }
 
@@ -526,7 +526,7 @@ ktime_t tick_nohz_get_sleep_length(void)
 static void tick_nohz_restart(struct tick_sched *ts, ktime_t now)
 {
         hrtimer_cancel(&ts->sched_timer);
-        hrtimer_set_expires(&ts->sched_timer, ts->idle_tick);
+        hrtimer_set_expires(&ts->sched_timer, ts->last_tick);
 
         while (1) {
                 /* Forward the time to expire in the future */
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 3258455549f..af5a7e9f164 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -167,7 +167,7 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
         {
                 struct tick_sched *ts = tick_get_tick_sched(cpu);
                 P(nohz_mode);
-                P_ns(idle_tick);
+                P_ns(last_tick);
                 P(tick_stopped);
                 P(idle_jiffies);
                 P(idle_calls);
@@ -259,7 +259,7 @@ static int timer_list_show(struct seq_file *m, void *v)
         u64 now = ktime_to_ns(ktime_get());
         int cpu;
 
-        SEQ_printf(m, "Timer List Version: v0.6\n");
+        SEQ_printf(m, "Timer List Version: v0.7\n");
         SEQ_printf(m, "HRTIMER_MAX_CLOCK_BASES: %d\n", HRTIMER_MAX_CLOCK_BASES);
         SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);