diff options
| author | Allen Pais <allen.pais@oracle.com> | 2017-10-24 11:38:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-15 06:36:27 +0100 |
| commit | ff0296877a8d04db27997ec216376d7bbdf75a0b (patch) | |
| tree | fdf27ce2fbde92038de1a4a54181ca550ed56731 /arch/sparc | |
| parent | sparc64: convert mdesc_handle.refcnt from atomic_t to refcount_t (diff) | |
| download | linux-ff0296877a8d04db27997ec216376d7bbdf75a0b.tar.xz linux-ff0296877a8d04db27997ec216376d7bbdf75a0b.zip | |
sparc64: Convert timers to user timer_setup()
Switch to using the new timer_setup() and from_timer()
in LDOM Virtual I/O handshake.
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/viohs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c index dcd278f29573..7cb27c2fb16f 100644 --- a/arch/sparc/kernel/viohs.c +++ b/arch/sparc/kernel/viohs.c @@ -797,9 +797,9 @@ void vio_port_up(struct vio_driver_state *vio) } EXPORT_SYMBOL(vio_port_up); -static void vio_port_timer(unsigned long _arg) +static void vio_port_timer(struct timer_list *t) { - struct vio_driver_state *vio = (struct vio_driver_state *) _arg; + struct vio_driver_state *vio = from_timer(vio, t, timer); vio_port_up(vio); } @@ -848,7 +848,7 @@ int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev, vio->ops = ops; - setup_timer(&vio->timer, vio_port_timer, (unsigned long) vio); + timer_setup(&vio->timer, vio_port_timer, 0); return 0; } |