posix-timers: Move the do_schedule_next_timer declaration

[karo-tx-linux.git] / include / linux / posix-timers.h

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 64aa189efe21d6792b07f2b9005fcf5345b2e98c..8929f7e8f4523b09af0796842ed342060028de37 100644 (file)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -7,6 +7,7 @@
 #include <linux/timex.h>
 #include <linux/alarmtimer.h>
 
+struct siginfo;
 
 struct cpu_timer_list {
        struct list_head entry;
@@ -72,12 +73,6 @@ struct k_itimer {
                        ktime_t interval;
                } real;
                struct cpu_timer_list cpu;
-               struct {
-                       unsigned int clock;
-                       unsigned int node;
-                       unsigned long incr;
-                       unsigned long expires;
-               } mmtimer;
                struct {
                        struct alarm alarmtimer;
                        ktime_t interval;
@@ -87,28 +82,29 @@ struct k_itimer {
 };
 
 struct k_clock {
-       int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
+       int (*clock_getres) (const clockid_t which_clock, struct timespec64 *tp);
        int (*clock_set) (const clockid_t which_clock,
-                         const struct timespec *tp);
-       int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
+                         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,
-                      struct timespec *, struct timespec __user *);
+                      struct timespec64 *, struct timespec __user *);
        long (*nsleep_restart) (struct restart_block *restart_block);
-       int (*timer_set) (struct k_itimer * timr, int flags,
-                         struct itimerspec * new_setting,
-                         struct itimerspec * old_setting);
-       int (*timer_del) (struct k_itimer * timr);
+       int (*timer_set) (struct k_itimer *timr, int flags,
+                         struct itimerspec64 *new_setting,
+                         struct itimerspec64 *old_setting);
+       int (*timer_del) (struct k_itimer *timr);
 #define TIMER_RETRY 1
-       void (*timer_get) (struct k_itimer * timr,
-                          struct itimerspec * cur_setting);
+       void (*timer_get) (struct k_itimer *timr,
+                          struct itimerspec64 *cur_setting);
 };
 
-extern struct k_clock clock_posix_cpu;
-extern struct k_clock clock_posix_dynamic;
-
-void posix_timers_register_clock(const clockid_t clock_id, struct k_clock *new_clock);
+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;
 
 /* function to call to trigger timer event */
 int posix_timer_event(struct k_itimer *timr, int si_private);
@@ -125,4 +121,6 @@ long clock_nanosleep_restart(struct restart_block *restart_block);
 
 void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new);
 
+void do_schedule_next_timer(struct siginfo *info);
+
 #endif