2013-07-07 14:19:16

by Michael S. Tsirkin

[permalink] [raw]
Subject: [PATCH] virtio: include asm/barrier explicitly

virtio_ring.h uses mb() and friends, make
it pull in asm/barrier.h itself, not rely
on other headers to do it.

Signed-off-by: Michael S. Tsirkin <[email protected]>
---
include/linux/virtio_ring.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index ca3ad41..b300787 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -1,6 +1,7 @@
#ifndef _LINUX_VIRTIO_RING_H
#define _LINUX_VIRTIO_RING_H

+#include <asm/barrier.h>
#include <linux/irqreturn.h>
#include <uapi/linux/virtio_ring.h>

--
MST


2013-07-07 14:20:23

by Michael S. Tsirkin

[permalink] [raw]
Subject: Re: [PATCH] virtio: include asm/barrier explicitly

On Sun, Jul 07, 2013 at 05:20:19PM +0300, Michael S. Tsirkin wrote:
> virtio_ring.h uses mb() and friends, make
> it pull in asm/barrier.h itself, not rely
> on other headers to do it.
>
> Signed-off-by: Michael S. Tsirkin <[email protected]>

In particular this fixes warnings during test build:
[linux]$ make -C tools/virtio/
make: Entering directory `/home/mst/scm/linux/tools/virtio'
cc -g -O2 -Wall -I. -I ../../usr/include/ -Wno-pointer-sign
-fno-strict-overflow -fno-strict-aliasing -fno-common -MMD
-U_FORTIFY_SOURCE -c -o virtio_test.o virtio_test.c
In file included from ./linux/virtio_ring.h:1:0,
from ../../usr/include/linux/vhost.h:17,
from virtio_test.c:14:
./linux/../../../include/linux/virtio_ring.h: In function ‘virtio_mb’:
./linux/../../../include/linux/virtio_ring.h:50:2: warning: implicit
declaration of function ‘mb’ [-Wimplicit-function-declaration]


> ---
> include/linux/virtio_ring.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
> index ca3ad41..b300787 100644
> --- a/include/linux/virtio_ring.h
> +++ b/include/linux/virtio_ring.h
> @@ -1,6 +1,7 @@
> #ifndef _LINUX_VIRTIO_RING_H
> #define _LINUX_VIRTIO_RING_H
>
> +#include <asm/barrier.h>
> #include <linux/irqreturn.h>
> #include <uapi/linux/virtio_ring.h>
>
> --
> MST

2013-07-08 02:22:16

by Rusty Russell

[permalink] [raw]
Subject: Re: [PATCH] virtio: include asm/barrier explicitly

"Michael S. Tsirkin" <[email protected]> writes:
> virtio_ring.h uses mb() and friends, make
> it pull in asm/barrier.h itself, not rely
> on other headers to do it.
>
> Signed-off-by: Michael S. Tsirkin <[email protected]>

Applied.

Thanks,
Rusty.
PS. I'll squeeze these into this merge window, since they're trivial.

2013-07-08 05:33:08

by Stephen Rothwell

[permalink] [raw]
Subject: Re: [PATCH] virtio: include asm/barrier explicitly

Hi Rusty,

On Mon, 08 Jul 2013 11:31:45 +0930 Rusty Russell <[email protected]> wrote:
>
> PS. I'll squeeze these into this merge window, since they're trivial.

s/'re trivial/fix bugs/ ;-)

--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (266.00 B)
(No filename) (836.00 B)
Download all attachments