redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

tty/sysrq: Convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Kees Cook 2017-10-16 16:28:51 -07:00 committed by Greg Kroah-Hartman
parent f0f62c67dd
commit 8c318fa93d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/tty/sysrq.c
View File

@ -653,9 +653,9 @@ static void sysrq_parse_reset_sequence(struct sysrq_state *state)
state->reset_seq_version = sysrq_reset_seq_version; state->reset_seq_version = sysrq_reset_seq_version;
} }
static void sysrq_do_reset(unsigned long _state) static void sysrq_do_reset(struct timer_list *t)
{ {
struct sysrq_state *state = (struct sysrq_state *) _state; struct sysrq_state *state = from_timer(state, t, keyreset_timer);
state->reset_requested = true; state->reset_requested = true;
@ -672,7 +672,7 @@ static void sysrq_handle_reset_request(struct sysrq_state *state)
mod_timer(&state->keyreset_timer, mod_timer(&state->keyreset_timer,
jiffies + msecs_to_jiffies(sysrq_reset_downtime_ms)); jiffies + msecs_to_jiffies(sysrq_reset_downtime_ms));
else else
sysrq_do_reset((unsigned long)state); sysrq_do_reset(&state->keyreset_timer);
} }
static void sysrq_detect_reset_sequence(struct sysrq_state *state, static void sysrq_detect_reset_sequence(struct sysrq_state *state,
@ -908,8 +908,7 @@ static int sysrq_connect(struct input_handler *handler,
sysrq->handle.handler = handler; sysrq->handle.handler = handler;
sysrq->handle.name = "sysrq"; sysrq->handle.name = "sysrq";
sysrq->handle.private = sysrq; sysrq->handle.private = sysrq;
setup_timer(&sysrq->keyreset_timer, timer_setup(&sysrq->keyreset_timer, sysrq_do_reset, 0);
sysrq_do_reset, (unsigned long)sysrq);
error = input_register_handle(&sysrq->handle); error = input_register_handle(&sysrq->handle);
if (error) { if (error) {