summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-03-20 10:11:28 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-06 09:28:50 +0200
commitefefc97736e6f3261879bc9dddcb161224a455f5 (patch)
tree21cfd61eb7bad8422a62bf3d539f7a3ae1b21cad /kernel
parented98c34919985a9f87c3edacb9a8d8c283c9e243 (diff)
downloadlinux-stable-efefc97736e6f3261879bc9dddcb161224a455f5.tar.gz
linux-stable-efefc97736e6f3261879bc9dddcb161224a455f5.tar.bz2
linux-stable-efefc97736e6f3261879bc9dddcb161224a455f5.zip
jiffies: Introduce USER_TICK_USEC and redefine TICK_USEC
Since the subsequent changes will need a TICK_USEC definition analogous to TICK_NSEC, rename the existing TICK_USEC as USER_TICK_USEC, update its users and redefine TICK_USEC accordingly. Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/ntp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 8d70da1b9a0d..a09ded765f6c 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -31,7 +31,7 @@
/* USER_HZ period (usecs): */
-unsigned long tick_usec = TICK_USEC;
+unsigned long tick_usec = USER_TICK_USEC;
/* SHIFTED_HZ period (nsecs): */
unsigned long tick_nsec;