posix-timers: Move posix-timer internals to core

None of these declarations is required outside of kernel/time. Move them to
an internal header.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/20170530211656.394803853@linutronix.de

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index e06062c3967bf53334aa3f69c003a7a2cc26c9d5..a372e7e3a396b8cdb45e1e456d3d0353af5028d0 100644 (file)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -100,36 +100,6 @@ struct k_itimer {
        } it;
 };
 
-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,
-                      struct timespec64 *, struct timespec __user *);
-       long (*nsleep_restart) (struct restart_block *restart_block);
-       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 itimerspec64 *cur_setting);
-};
-
-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);
-
-void posix_cpu_timer_schedule(struct k_itimer *timer);
-
 void run_posix_cpu_timers(struct task_struct *task);
 void posix_cpu_timers_exit(struct task_struct *task);
 void posix_cpu_timers_exit_group(struct task_struct *task);

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 2a8675f9aac5c573c89c2b2d226fa1f8c4fcd54a..36855d675da5e6f014bd2593cd824a1141fcc4b0 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -28,6 +28,8 @@
 #include <linux/workqueue.h>
 #include <linux/freezer.h>
 
+#include "posix-timers.h"
+
 #define CREATE_TRACE_POINTS
 #include <trace/events/alarmtimer.h>
 

diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index bd4fb785652f502ec55038bee84012f9a92163b4..17cdc554c9fe82c56e9d8a5b68c48715425dcd09 100644 (file)
--- 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);
 
 /*

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index c99434739fd5a8f3265458ebca69a4b5d03d010f..a77a792f2570f6275c16c50e48f8a3a9934df329 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -13,6 +13,8 @@
 #include <linux/tick.h>
 #include <linux/workqueue.h>
 
+#include "posix-timers.h"
+
 /*
  * Called after updating RLIMIT_CPU to run cpu timer and update
  * tsk->signal->cputime_expires expiration cache if necessary. Needs

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index b60b655dfbcdd8ef2291c77c1b683fcf64c2d584..dee6a0d911d4087dc3f75db3e6e766e5581d3210 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -51,6 +51,7 @@
 #include <linux/hashtable.h>
 
 #include "timekeeping.h"
+#include "posix-timers.h"
 
 /*
  * Management arrays for POSIX timers. Timers are now kept in static hash table

diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
new file mode 100644 (file)
index 0000000..ad2dbd2
--- /dev/null
+++ b/kernel/time/posix-timers.h
@@ -0,0 +1,29 @@
+#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,
+                      struct timespec64 *, struct timespec __user *);
+       long (*nsleep_restart) (struct restart_block *restart_block);
+       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);
+};
+
+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 posix_cpu_timer_schedule(struct k_itimer *timer);