Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer and clockevent updates from Thomas Gleixner:
 "The time(r) core and clockevent updates are mostly boring this time:

   - A new driver for the Tegra210 timer

   - Small fixes and improvements alll over the place

   - Documentation updates and cleanups"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  soc/tegra: default select TEGRA_TIMER for Tegra210
  clocksource/drivers/tegra: Add Tegra210 timer support
  dt-bindings: timer: add Tegra210 timer
  clocksource/drivers/timer-cs5535: Rename the file for consistency
  clocksource/drivers/timer-pxa: Rename the file for consistency
  clocksource/drivers/tango-xtal: Rename the file for consistency
  dt-bindings: timer: gpt: update binding doc
  clocksource/drivers/exynos_mct: Remove unused header includes
  dt-bindings: timer: mediatek: update bindings for MT7629 SoC
  clocksource/drivers/exynos_mct: Fix error path in timer resources initialization
  clocksource/drivers/exynos_mct: Remove dead code
  clocksource/drivers/riscv: Add required checks during clock source init
  dt-bindings: timer: renesas: tmu: Document r8a774c0 bindings
  dt-bindings: timer: renesas, cmt: Document r8a774c0 CMT support
  clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown
  clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR
  clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability
  clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable
  timers: Mark expected switch fall-throughs
  timekeeping/debug: No need to check return value of debugfs_create functions
  ...

7 files changed, 40 insertions, 48 deletions

diff --git a/kernel/rcu/Kconfig b/kernel/rcu/Kconfig
index 939a2056c87a..37301430970e 100644
--- a/kernel/rcu/Kconfig
+++ b/kernel/rcu/Kconfig
@@ -87,36 +87,6 @@ config RCU_STALL_COMMON
 config RCU_NEED_SEGCBLIST
         def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU )
 
-config CONTEXT_TRACKING
-       bool
-
-config CONTEXT_TRACKING_FORCE
-        bool "Force context tracking"
-        depends on CONTEXT_TRACKING
-        default y if !NO_HZ_FULL
-        help
-          The major pre-requirement for full dynticks to work is to
-          support the context tracking subsystem. But there are also
-          other dependencies to provide in order to make the full
-          dynticks working.
-
-          This option stands for testing when an arch implements the
-          context tracking backend but doesn't yet fullfill all the
-          requirements to make the full dynticks feature working.
-          Without the full dynticks, there is no way to test the support
-          for context tracking and the subsystems that rely on it: RCU
-          userspace extended quiescent state and tickless cputime
-          accounting. This option copes with the absence of the full
-          dynticks subsystem by forcing the context tracking on all
-          CPUs in the system.
-
-          Say Y only if you're working on the development of an
-          architecture backend for the context tracking.
-
-          Say N otherwise, this option brings an overhead that you
-          don't want in production.
-
-
 config RCU_FANOUT
         int "Tree-based hierarchical RCU fanout value"
         range 2 64 if 64BIT
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 58b981f4bb5d..e2c038d6c13c 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -117,6 +117,35 @@ config NO_HZ_FULL
 
 endchoice
 
+config CONTEXT_TRACKING
+       bool
+
+config CONTEXT_TRACKING_FORCE
+        bool "Force context tracking"
+        depends on CONTEXT_TRACKING
+        default y if !NO_HZ_FULL
+        help
+          The major pre-requirement for full dynticks to work is to
+          support the context tracking subsystem. But there are also
+          other dependencies to provide in order to make the full
+          dynticks working.
+
+          This option stands for testing when an arch implements the
+          context tracking backend but doesn't yet fullfill all the
+          requirements to make the full dynticks feature working.
+          Without the full dynticks, there is no way to test the support
+          for context tracking and the subsystems that rely on it: RCU
+          userspace extended quiescent state and tickless cputime
+          accounting. This option copes with the absence of the full
+          dynticks subsystem by forcing the context tracking on all
+          CPUs in the system.
+
+          Say Y only if you're working on the development of an
+          architecture backend for the context tracking.
+
+          Say N otherwise, this option brings an overhead that you
+          don't want in production.
+
 config NO_HZ
         bool "Old Idle dynticks config"
         depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f5cfa1b73d6f..6418e1bdc549 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -364,7 +364,7 @@ static bool hrtimer_fixup_activate(void *addr, enum debug_obj_state state)
         switch (state) {
         case ODEBUG_STATE_ACTIVE:
                 WARN_ON(1);
-
+                /* fall through */
         default:
                 return false;
         }
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 80f955210861..0a426f4e3125 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -67,13 +67,13 @@ static void bump_cpu_timer(struct k_itimer *timer, u64 now)
         int i;
         u64 delta, incr;
 
-        if (timer->it.cpu.incr == 0)
+        if (!timer->it_interval)
                 return;
 
         if (now < timer->it.cpu.expires)
                 return;
 
-        incr = timer->it.cpu.incr;
+        incr = timer->it_interval;
         delta = now + incr - timer->it.cpu.expires;
 
         /* Don't use (incr*2 < delta), incr*2 might overflow. */
@@ -520,7 +520,7 @@ static void cpu_timer_fire(struct k_itimer *timer)
                  */
                 wake_up_process(timer->it_process);
                 timer->it.cpu.expires = 0;
-        } else if (timer->it.cpu.incr == 0) {
+        } else if (!timer->it_interval) {
                 /*
                  * One-shot timer.  Clear it as soon as it's fired.
                  */
@@ -606,7 +606,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
          */
 
         ret = 0;
-        old_incr = timer->it.cpu.incr;
+        old_incr = timer->it_interval;
         old_expires = timer->it.cpu.expires;
         if (unlikely(timer->it.cpu.firing)) {
                 timer->it.cpu.firing = -1;
@@ -684,8 +684,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
          * Install the new reload setting, and
          * set up the signal and overrun bookkeeping.
          */
-        timer->it.cpu.incr = timespec64_to_ns(&new->it_interval);
-        timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
+        timer->it_interval = timespec64_to_ktime(new->it_interval);
 
         /*
          * This acts as a modification timestamp for the timer,
@@ -724,7 +723,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp
         /*
          * Easy part: convert the reload time.
          */
-        itp->it_interval = ns_to_timespec64(timer->it.cpu.incr);
+        itp->it_interval = ktime_to_timespec64(timer->it_interval);
 
         if (!timer->it.cpu.expires)
                 return;
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 803fa67aace9..ee834d4fb814 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -375,6 +375,7 @@ void tick_broadcast_control(enum tick_broadcast_mode mode)
         switch (mode) {
         case TICK_BROADCAST_FORCE:
                 tick_broadcast_forced = 1;
+                /* fall through */
         case TICK_BROADCAST_ON:
                 cpumask_set_cpu(cpu, tick_broadcast_on);
                 if (!cpumask_test_and_set_cpu(cpu, tick_broadcast_mask)) {
diff --git a/kernel/time/timekeeping_debug.c b/kernel/time/timekeeping_debug.c
index 86489950d690..b73e8850e58d 100644
--- a/kernel/time/timekeeping_debug.c
+++ b/kernel/time/timekeeping_debug.c
@@ -37,15 +37,8 @@ DEFINE_SHOW_ATTRIBUTE(tk_debug_sleep_time);
 
 static int __init tk_debug_sleep_time_init(void)
 {
-        struct dentry *d;
-
-        d = debugfs_create_file("sleep_time", 0444, NULL, NULL,
-                &tk_debug_sleep_time_fops);
-        if (!d) {
-                pr_err("Failed to create sleep_time debug file\n");
-                return -ENOMEM;
-        }
-
+        debugfs_create_file("sleep_time", 0444, NULL, NULL,
+                            &tk_debug_sleep_time_fops);
         return 0;
 }
 late_initcall(tk_debug_sleep_time_init);
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 444156debfa0..167e71f9ed3c 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -647,7 +647,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state)
 
         case ODEBUG_STATE_ACTIVE:
                 WARN_ON(1);
-
+                /* fall through */
         default:
                 return false;
         }