posix-timers: Kill ->nsleep_restart()

No more users.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170607084241.28657-8-viro@ZenIV.linux.org.uk

5 files changed, 1 insertions, 13 deletions

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 38b968f3df4e..d83b7ed1cb0e 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -457,7 +457,6 @@ extern int nanosleep_copyout(struct restart_block *, struct timespec *);
 extern long hrtimer_nanosleep(struct timespec64 *rqtp,
                               const enum hrtimer_mode mode,
                               const clockid_t clockid);
-extern long hrtimer_nanosleep_restart(struct restart_block *restart_block);
 
 extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
                                  struct task_struct *tsk);
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index db2f5f7b4ba5..45f83cc7c0c7 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1496,7 +1496,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
         return -ERESTART_RESTARTBLOCK;
 }
 
-long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
+static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
 {
         struct hrtimer_sleeper t;
         int ret;
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 993a924d1399..515148d4eeb1 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1386,10 +1386,6 @@ static int process_cpu_nsleep(const clockid_t which_clock, int flags,
 {
         return posix_cpu_nsleep(PROCESS_CLOCK, flags, rqtp);
 }
-static long process_cpu_nsleep_restart(struct restart_block *restart_block)
-{
-        return -EINVAL;
-}
 static int thread_cpu_clock_getres(const clockid_t which_clock,
                                    struct timespec64 *tp)
 {
@@ -1412,7 +1408,6 @@ const struct k_clock clock_posix_cpu = {
         .clock_get      = posix_cpu_clock_get,
         .timer_create   = posix_cpu_timer_create,
         .nsleep         = posix_cpu_nsleep,
-        .nsleep_restart = posix_cpu_nsleep_restart,
         .timer_set      = posix_cpu_timer_set,
         .timer_del      = posix_cpu_timer_del,
         .timer_get      = posix_cpu_timer_get,
@@ -1424,7 +1419,6 @@ const struct k_clock clock_process = {
         .clock_get      = process_cpu_clock_get,
         .timer_create   = process_cpu_timer_create,
         .nsleep         = process_cpu_nsleep,
-        .nsleep_restart = process_cpu_nsleep_restart,
 };
 
 const struct k_clock clock_thread = {
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index bec86b6b9814..ea4a463436bf 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -1111,7 +1111,6 @@ static const struct k_clock clock_realtime = {
         .clock_set              = posix_clock_realtime_set,
         .clock_adj              = posix_clock_realtime_adj,
         .nsleep                 = common_nsleep,
-        .nsleep_restart         = hrtimer_nanosleep_restart,
         .timer_create           = common_timer_create,
         .timer_set              = common_timer_set,
         .timer_get              = common_timer_get,
@@ -1127,7 +1126,6 @@ static const struct k_clock clock_monotonic = {
         .clock_getres           = posix_get_hrtimer_res,
         .clock_get              = posix_ktime_get_ts,
         .nsleep                 = common_nsleep,
-        .nsleep_restart         = hrtimer_nanosleep_restart,
         .timer_create           = common_timer_create,
         .timer_set              = common_timer_set,
         .timer_get              = common_timer_get,
@@ -1158,7 +1156,6 @@ static const struct k_clock clock_tai = {
         .clock_getres           = posix_get_hrtimer_res,
         .clock_get              = posix_get_tai,
         .nsleep                 = common_nsleep,
-        .nsleep_restart         = hrtimer_nanosleep_restart,
         .timer_create           = common_timer_create,
         .timer_set              = common_timer_set,
         .timer_get              = common_timer_get,
@@ -1174,7 +1171,6 @@ static const struct k_clock clock_boottime = {
         .clock_getres           = posix_get_hrtimer_res,
         .clock_get              = posix_get_boottime,
         .nsleep                 = common_nsleep,
-        .nsleep_restart         = hrtimer_nanosleep_restart,
         .timer_create           = common_timer_create,
         .timer_set              = common_timer_set,
         .timer_get              = common_timer_get,
diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
index bfd9e15c6ce0..5e69bb85629f 100644
--- a/kernel/time/posix-timers.h
+++ b/kernel/time/posix-timers.h
@@ -11,7 +11,6 @@ struct k_clock {
         int     (*timer_create)(struct k_itimer *timer);
         int     (*nsleep)(const clockid_t which_clock, int flags,
                           struct timespec64 *);
-        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);