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

Pull timer updates from Thomas Gleixner:
 "Nothing really exciting this time:

   - a few fixlets in the NOHZ code

   - a new ARM SoC timer abomination.  One should expect that we have
     enough of them already, but they insist on inventing new ones.

   - the usual bunch of ARM SoC timer updates.  That feels like herding
     cats"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: arm_arch_timer: Consolidate arch_timer_evtstrm_enable
  clocksource: arm_arch_timer: Enable counter access for 32-bit ARM
  clocksource: arm_arch_timer: Change clocksource name if CP15 unavailable
  clocksource: sirf: Disable counter before re-setting it
  clocksource: cadence_ttc: Add support for 32bit mode
  clocksource: tcb_clksrc: Sanitize IRQ request
  clocksource: arm_arch_timer: Discard unavailable timers correctly
  clocksource: vf_pit_timer: Support shutdown mode
  ARM: meson6: clocksource: Add Meson6 timer support
  ARM: meson: documentation: Add timer documentation
  clocksource: sh_tmu: Document r8a7779 binding
  clocksource: sh_mtu2: Document r7s72100 binding
  clocksource: sh_cmt: Document SoC specific bindings
  timerfd: Remove an always true check
  nohz: Avoid tick's double reprogramming in highres mode
  nohz: Fix spurious periodic tick behaviour in low-res dynticks mode

2 files changed, 0 insertions, 56 deletions

diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 0704e0cf5571..92793ba69c40 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -99,31 +99,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
         asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
 }
 
-static inline void arch_counter_set_user_access(void)
-{
-        u32 cntkctl = arch_timer_get_cntkctl();
-
-        /* Disable user access to both physical/virtual counters/timers */
-        /* Also disable virtual event stream */
-        cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
-                        | ARCH_TIMER_USR_VT_ACCESS_EN
-                        | ARCH_TIMER_VIRT_EVT_EN
-                        | ARCH_TIMER_USR_VCT_ACCESS_EN
-                        | ARCH_TIMER_USR_PCT_ACCESS_EN);
-        arch_timer_set_cntkctl(cntkctl);
-}
-
-static inline void arch_timer_evtstrm_enable(int divider)
-{
-        u32 cntkctl = arch_timer_get_cntkctl();
-        cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
-        /* Set the divider and enable virtual event stream */
-        cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
-                        | ARCH_TIMER_VIRT_EVT_EN;
-        arch_timer_set_cntkctl(cntkctl);
-        elf_hwcap |= HWCAP_EVTSTRM;
-}
-
 #endif
 
 #endif
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 9400596a0f39..f19097134b02 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -104,37 +104,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
         asm volatile("msr       cntkctl_el1, %0" : : "r" (cntkctl));
 }
 
-static inline void arch_counter_set_user_access(void)
-{
-        u32 cntkctl = arch_timer_get_cntkctl();
-
-        /* Disable user access to the timers and the physical counter */
-        /* Also disable virtual event stream */
-        cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
-                        | ARCH_TIMER_USR_VT_ACCESS_EN
-                        | ARCH_TIMER_VIRT_EVT_EN
-                        | ARCH_TIMER_USR_PCT_ACCESS_EN);
-
-        /* Enable user access to the virtual counter */
-        cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;
-
-        arch_timer_set_cntkctl(cntkctl);
-}
-
-static inline void arch_timer_evtstrm_enable(int divider)
-{
-        u32 cntkctl = arch_timer_get_cntkctl();
-        cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
-        /* Set the divider and enable virtual event stream */
-        cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
-                        | ARCH_TIMER_VIRT_EVT_EN;
-        arch_timer_set_cntkctl(cntkctl);
-        elf_hwcap |= HWCAP_EVTSTRM;
-#ifdef CONFIG_COMPAT
-        compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
-#endif
-}
-
 static inline u64 arch_counter_get_cntvct(void)
 {
         u64 cval;