lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/16] kill ->nsleep_restart()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    include/linux/hrtimer.h | 1 -
    kernel/time/hrtimer.c | 2 +-
    kernel/time/posix-cpu-timers.c | 6 ------
    kernel/time/posix-timers.c | 4 ----
    kernel/time/posix-timers.h | 1 -
    5 files changed, 1 insertion(+), 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 6c19995e977e..5dd4b3a34495 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -1489,7 +1489,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 ba0d7e34616b..f6c5f77b944d 100644
    --- a/kernel/time/posix-cpu-timers.c
    +++ b/kernel/time/posix-cpu-timers.c
    @@ -1385,10 +1385,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)
    {
    @@ -1411,7 +1407,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,
    @@ -1423,7 +1418,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 b729e1c0b57d..922acf713cc0 100644
    --- a/kernel/time/posix-timers.c
    +++ b/kernel/time/posix-timers.c
    @@ -1096,7 +1096,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,
    @@ -1112,7 +1111,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,
    @@ -1143,7 +1141,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,
    @@ -1159,7 +1156,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);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-06-12 01:01    [W:6.578 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site