Skip to content

Commit

Permalink
virtio(4): Avoid name collision with global intrhand on sparc64.
Browse files Browse the repository at this point in the history
Pacifies -Werror=shadow.

No functional change intended.
  • Loading branch information
riastradh authored and riastradh committed Mar 27, 2023
1 parent 7ac029e commit eef7639
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sys/dev/pci/virtio.c
@@ -1,4 +1,4 @@
/* $NetBSD: virtio.c,v 1.69 2023/03/25 02:59:23 yamaguchi Exp $ */
/* $NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $ */

/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
Expand Down Expand Up @@ -28,7 +28,7 @@
*/

#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.69 2023/03/25 02:59:23 yamaguchi Exp $");
__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $");

#include <sys/param.h>
#include <sys/systm.h>
Expand Down Expand Up @@ -746,15 +746,15 @@ virtio_init_vq_vqdone(struct virtio_softc *sc, struct virtqueue *vq,

void
virtio_init_vq(struct virtio_softc *sc, struct virtqueue *vq, int index,
int (*intrhand)(void *), void *arg)
int (*func)(void *), void *arg)
{

memset(vq, 0, sizeof(*vq));

vq->vq_owner = sc;
vq->vq_num = sc->sc_ops->read_queue_size(sc, index);
vq->vq_index = index;
vq->vq_intrhand = intrhand;
vq->vq_intrhand = func;
vq->vq_intrhand_arg = arg;
}

Expand Down

0 comments on commit eef7639

Please sign in to comment.