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, 3 insertions, 114 deletions

diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index 31d588d37a17..17cdc554c9fe 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -25,6 +25,8 @@
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 
+#include "posix-timers.h"
+
 static void delete_clock(struct kref *kref);
 
 /*
@@ -82,38 +84,6 @@ static unsigned int posix_clock_poll(struct file *fp, poll_table *wait)
         return result;
 }
 
-static int posix_clock_fasync(int fd, struct file *fp, int on)
-{
-        struct posix_clock *clk = get_posix_clock(fp);
-        int err = 0;
-
-        if (!clk)
-                return -ENODEV;
-
-        if (clk->ops.fasync)
-                err = clk->ops.fasync(clk, fd, fp, on);
-
-        put_posix_clock(clk);
-
-        return err;
-}
-
-static int posix_clock_mmap(struct file *fp, struct vm_area_struct *vma)
-{
-        struct posix_clock *clk = get_posix_clock(fp);
-        int err = -ENODEV;
-
-        if (!clk)
-                return -ENODEV;
-
-        if (clk->ops.mmap)
-                err = clk->ops.mmap(clk, vma);
-
-        put_posix_clock(clk);
-
-        return err;
-}
-
 static long posix_clock_ioctl(struct file *fp,
                               unsigned int cmd, unsigned long arg)
 {
@@ -199,8 +169,6 @@ static const struct file_operations posix_clock_file_operations = {
         .unlocked_ioctl = posix_clock_ioctl,
         .open           = posix_clock_open,
         .release        = posix_clock_release,
-        .fasync         = posix_clock_fasync,
-        .mmap           = posix_clock_mmap,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = posix_clock_compat_ioctl,
 #endif
@@ -359,88 +327,9 @@ out:
         return err;
 }
 
-static int pc_timer_create(struct k_itimer *kit)
-{
-        clockid_t id = kit->it_clock;
-        struct posix_clock_desc cd;
-        int err;
-
-        err = get_clock_desc(id, &cd);
-        if (err)
-                return err;
-
-        if (cd.clk->ops.timer_create)
-                err = cd.clk->ops.timer_create(cd.clk, kit);
-        else
-                err = -EOPNOTSUPP;
-
-        put_clock_desc(&cd);
-
-        return err;
-}
-
-static int pc_timer_delete(struct k_itimer *kit)
-{
-        clockid_t id = kit->it_clock;
-        struct posix_clock_desc cd;
-        int err;
-
-        err = get_clock_desc(id, &cd);
-        if (err)
-                return err;
-
-        if (cd.clk->ops.timer_delete)
-                err = cd.clk->ops.timer_delete(cd.clk, kit);
-        else
-                err = -EOPNOTSUPP;
-
-        put_clock_desc(&cd);
-
-        return err;
-}
-
-static void pc_timer_gettime(struct k_itimer *kit, struct itimerspec64 *ts)
-{
-        clockid_t id = kit->it_clock;
-        struct posix_clock_desc cd;
-
-        if (get_clock_desc(id, &cd))
-                return;
-
-        if (cd.clk->ops.timer_gettime)
-                cd.clk->ops.timer_gettime(cd.clk, kit, ts);
-
-        put_clock_desc(&cd);
-}
-
-static int pc_timer_settime(struct k_itimer *kit, int flags,
-                            struct itimerspec64 *ts, struct itimerspec64 *old)
-{
-        clockid_t id = kit->it_clock;
-        struct posix_clock_desc cd;
-        int err;
-
-        err = get_clock_desc(id, &cd);
-        if (err)
-                return err;
-
-        if (cd.clk->ops.timer_settime)
-                err = cd.clk->ops.timer_settime(cd.clk, kit, flags, ts, old);
-        else
-                err = -EOPNOTSUPP;
-
-        put_clock_desc(&cd);
-
-        return err;
-}
-
-struct k_clock clock_posix_dynamic = {
+const struct k_clock clock_posix_dynamic = {
         .clock_getres   = pc_clock_getres,
         .clock_set      = pc_clock_settime,
         .clock_get      = pc_clock_gettime,
         .clock_adj      = pc_clock_adjtime,
-        .timer_create   = pc_timer_create,
-        .timer_set      = pc_timer_settime,
-        .timer_del      = pc_timer_delete,
-        .timer_get      = pc_timer_gettime,
 };