Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
[sfrench/cifs-2.6.git] / net / sunrpc / svc.c
index e5e4e18699c8b02ffe5600e451b59eb6d78588a1..387cc4add6f6551fe9a9b5cc96566aab00b843bc 100644 (file)
@@ -455,7 +455,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
        serv->sv_xdrsize   = xdrsize;
        INIT_LIST_HEAD(&serv->sv_tempsocks);
        INIT_LIST_HEAD(&serv->sv_permsocks);
-       init_timer(&serv->sv_temptimer);
+       timer_setup(&serv->sv_temptimer, NULL, 0);
        spin_lock_init(&serv->sv_lock);
 
        __svc_init_bc(serv);