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

Pull timer updates from Thomas Gleixner:
 "A rather large update for timers/timekeeping:

   - compat syscall consolidation (Al Viro)

   - Posix timer consolidation (Christoph Helwig / Thomas Gleixner)

   - Cleanup of the device tree based initialization for clockevents and
     clocksources (Daniel Lezcano)

   - Consolidation of the FTTMR010 clocksource/event driver (Linus
     Walleij)

   - The usual set of small fixes and updates all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (93 commits)
  timers: Make the cpu base lock raw
  clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()'
  clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap
  clocksource/drivers/tcb_clksrc: Make IO endian agnostic
  clocksource/drivers/sun4i: Switch to the timer-of common init
  clocksource/drivers/timer-of: Fix invalid iomap check
  Revert "ktime: Simplify ktime_compare implementation"
  clocksource/drivers: Fix uninitialized variable use in timer_of_init
  kselftests: timers: Add test for frequency step
  kselftests: timers: Fix inconsistency-check to not ignore first timestamp
  time: Add warning about imminent deprecation of CONFIG_GENERIC_TIME_VSYSCALL_OLD
  time: Clean up CLOCK_MONOTONIC_RAW time handling
  posix-cpu-timers: Make timespec to nsec conversion safe
  itimer: Make timeval to nsec conversion range limited
  timers: Fix parameter description of try_to_del_timer_sync()
  ktime: Simplify ktime_compare implementation
  clocksource/drivers/fttmr010: Factor out clock read code
  clocksource/drivers/fttmr010: Implement delay timer
  clocksource/drivers: Add timer-of common init routine
  clocksource/drivers/tcb_clksrc: Save timer context on suspend/resume
  ...

1 files changed, 40 insertions, 0 deletions

diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
new file mode 100644
index 000000000000..fb303c3be4d3
--- /dev/null
+++ b/kernel/time/posix-timers.h
@@ -0,0 +1,40 @@
+#define TIMER_RETRY 1
+
+struct k_clock {
+        int     (*clock_getres)(const clockid_t which_clock,
+                                struct timespec64 *tp);
+        int     (*clock_set)(const clockid_t which_clock,
+                             const struct timespec64 *tp);
+        int     (*clock_get)(const clockid_t which_clock,
+                             struct timespec64 *tp);
+        int     (*clock_adj)(const clockid_t which_clock, struct timex *tx);
+        int     (*timer_create)(struct k_itimer *timer);
+        int     (*nsleep)(const clockid_t which_clock, int flags,
+                          const struct timespec64 *);
+        int     (*timer_set)(struct k_itimer *timr, int flags,
+                             struct itimerspec64 *new_setting,
+                             struct itimerspec64 *old_setting);
+        int     (*timer_del)(struct k_itimer *timr);
+        void    (*timer_get)(struct k_itimer *timr,
+                             struct itimerspec64 *cur_setting);
+        void    (*timer_rearm)(struct k_itimer *timr);
+        int     (*timer_forward)(struct k_itimer *timr, ktime_t now);
+        ktime_t (*timer_remaining)(struct k_itimer *timr, ktime_t now);
+        int     (*timer_try_to_cancel)(struct k_itimer *timr);
+        void    (*timer_arm)(struct k_itimer *timr, ktime_t expires,
+                             bool absolute, bool sigev_none);
+};
+
+extern const struct k_clock clock_posix_cpu;
+extern const struct k_clock clock_posix_dynamic;
+extern const struct k_clock clock_process;
+extern const struct k_clock clock_thread;
+extern const struct k_clock alarm_clock;
+
+int posix_timer_event(struct k_itimer *timr, int si_private);
+
+void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting);
+int common_timer_set(struct k_itimer *timr, int flags,
+                     struct itimerspec64 *new_setting,
+                     struct itimerspec64 *old_setting);
+int common_timer_del(struct k_itimer *timer);