diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-23 22:41:17 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-21 15:46:44 -0800 |
| commit | 6cc73a06da439e80c6686883d45ca32b614a4b97 (patch) | |
| tree | 39a870bb7402be7d67be0b786d6481f3ddbd3b59 /arch | |
| parent | 87c1d2d373c2dfc9993f09c3cfd69cf2c3347b20 (diff) | |
| download | linux-6cc73a06da439e80c6686883d45ca32b614a4b97.tar.gz linux-6cc73a06da439e80c6686883d45ca32b614a4b97.tar.bz2 linux-6cc73a06da439e80c6686883d45ca32b614a4b97.zip | |
s390: cmm: 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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/mm/cmm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index 2dbdcd85b68f..3d017171ff8f 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c @@ -56,10 +56,10 @@ static DEFINE_SPINLOCK(cmm_lock); static struct task_struct *cmm_thread_ptr; static DECLARE_WAIT_QUEUE_HEAD(cmm_thread_wait); -static DEFINE_TIMER(cmm_timer, NULL); -static void cmm_timer_fn(unsigned long); +static void cmm_timer_fn(struct timer_list *); static void cmm_set_timer(void); +static DEFINE_TIMER(cmm_timer, cmm_timer_fn); static long cmm_alloc_pages(long nr, long *counter, struct cmm_page_array **list) @@ -194,13 +194,11 @@ static void cmm_set_timer(void) if (mod_timer(&cmm_timer, jiffies + cmm_timeout_seconds*HZ)) return; } - cmm_timer.function = cmm_timer_fn; - cmm_timer.data = 0; cmm_timer.expires = jiffies + cmm_timeout_seconds*HZ; add_timer(&cmm_timer); } -static void cmm_timer_fn(unsigned long ignored) +static void cmm_timer_fn(struct timer_list *unused) { long nr; |