Merge branch 'upstream'

[sfrench/cifs-2.6.git] / include / linux / posix-timers.h

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index ae51473d3d483130e5c583edd4b8419e4a2de26d..95572c434bc991dc23dd5b9074d3bb36bd69b192 100644 (file)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -51,12 +51,8 @@ struct k_itimer {
        struct sigqueue *sigq;          /* signal queue entry. */
        union {
                struct {
-                       struct timer_list timer;
-                       /* clock abs_timer_list: */
-                       struct list_head abs_timer_entry;
-                       /* wall_to_monotonic used when set: */
-                       struct timespec wall_to_prev;
-                       unsigned long incr; /* interval in jiffies */
+                       struct hrtimer timer;
+                       ktime_t interval;
                } real;
                struct cpu_timer_list cpu;
                struct {
@@ -68,20 +64,14 @@ struct k_itimer {
        } it;
 };
 
-struct k_clock_abs {
-       struct list_head list;
-       spinlock_t lock;
-};
-
 struct k_clock {
        int res;                /* in nanoseconds */
        int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
-       struct k_clock_abs *abs_struct;
        int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
        int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
        int (*timer_create) (struct k_itimer *timer);
        int (*nsleep) (const clockid_t which_clock, int flags,
-                      struct timespec *);
+                      struct timespec *, struct timespec __user *);
        int (*timer_set) (struct k_itimer * timr, int flags,
                          struct itimerspec * new_setting,
                          struct itimerspec * old_setting);
@@ -94,42 +84,19 @@ struct k_clock {
 void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
 
 /* error handlers for timer_create, nanosleep and settime */
-int do_posix_clock_notimer_create(struct k_itimer *timer);
-int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *);
+int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *,
+                              struct timespec __user *);
 int do_posix_clock_nosettime(const clockid_t, struct timespec *tp);
 
 /* function to call to trigger timer event */
 int posix_timer_event(struct k_itimer *timr, int si_private);
 
-struct now_struct {
-       unsigned long jiffies;
-};
-
-#define posix_get_now(now) \
-       do { (now)->jiffies = jiffies; } while (0)
-
-#define posix_time_before(timer, now) \
-                      time_before((timer)->expires, (now)->jiffies)
-
-#define posix_bump_timer(timr, now)                                    \
-       do {                                                            \
-               long delta, orun;                                       \
-                                                                       \
-               delta = (now).jiffies - (timr)->it.real.timer.expires;  \
-               if (delta >= 0) {                                       \
-                       orun = 1 + (delta / (timr)->it.real.incr);      \
-                       (timr)->it.real.timer.expires +=                \
-                               orun * (timr)->it.real.incr;            \
-                       (timr)->it_overrun += orun;                     \
-               }                                                       \
-       } while (0)
-
 int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *ts);
 int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts);
 int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts);
 int posix_cpu_timer_create(struct k_itimer *timer);
 int posix_cpu_nsleep(const clockid_t which_clock, int flags,
-                    struct timespec *ts);
+                    struct timespec *rqtp, struct timespec __user *rmtp);
 int posix_cpu_timer_set(struct k_itimer *timer, int flags,
                        struct itimerspec *new, struct itimerspec *old);
 int posix_cpu_timer_del(struct k_itimer *timer);