Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / arch / ia64 / kernel / salinfo.c

diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 63dc9cdc95c53827d2df180c4c115bc5c290585e..52c404b08904cce1802d100896c9a036dae41230 100644 (file)
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -263,7 +263,7 @@ salinfo_timeout_check(struct salinfo_data *data)
 }
 
 static void
-salinfo_timeout (unsigned long arg)
+salinfo_timeout(struct timer_list *unused)
 {
        ia64_mlogbuf_dump();
        salinfo_timeout_check(salinfo_data + SAL_INFO_TYPE_MCA);
@@ -623,9 +623,8 @@ salinfo_init(void)
 
        *sdir++ = salinfo_dir;
 
-       init_timer(&salinfo_timer);
+       timer_setup(&salinfo_timer, salinfo_timeout, 0);
        salinfo_timer.expires = jiffies + SALINFO_TIMER_DELAY;
-       salinfo_timer.function = &salinfo_timeout;
        add_timer(&salinfo_timer);
 
        i = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "ia64/salinfo:online",