Re: linux-next: build warning after merge of the vhost tree

From: Michael S. Tsirkin
Date: Mon Mar 07 2022 - 06:25:52 EST


On Mon, Mar 07, 2022 at 09:12:42PM +1100, Stephen Rothwell wrote:
> Hi,
>
> On Mon, 7 Mar 2022 14:46:40 +0800 Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> wrote:
> >
> > Can you help me test this patch? I don't have an arm environment around me.
> >
> > Thanks
> >
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > index 1fa2d632a994..4d629d1ea894 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -1820,7 +1820,7 @@ static int virtnet_rx_vq_reset(struct virtnet_info *vi,
> >
> > err:
> > netdev_err(vi->dev,
> > - "reset rx reset vq fail: rx queue index: %ld err: %d\n",
> > + "reset rx reset vq fail: rx queue index: %td err: %d\n",
> > rq - vi->rq, err);
> > virtnet_napi_enable(rq->vq, &rq->napi);
> > return err;
> > @@ -1870,7 +1870,7 @@ static int virtnet_tx_vq_reset(struct virtnet_info *vi,
> >
> > err:
> > netdev_err(vi->dev,
> > - "reset tx reset vq fail: tx queue index: %ld err: %d\n",
> > + "reset tx reset vq fail: tx queue index: %td err: %d\n",
> > sq - vi->sq, err);
> > virtnet_napi_tx_enable(vi, sq->vq, &sq->napi);
> > return err;
>
> I had to apply that by hand, but it does work.
>
> Tested-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

OK, I squashed this into the problematic patch. Thanks a lot!

> --
> Cheers,
> Stephen Rothwell