Skip to contentSkip to conversation

virtio: include asm/barrier explicitly

PATCH Applied Michael S. Tsirkin 3 participants 4 messages Jul 7, 2013 – Jul 8, 2013

Subsystems (2)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 include/linux/virtio_ring.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/virtio_ring.h +1 -0
index ca3ad41..b300787 100644
@@ -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>
 
Signature · 1 line
MST
author maintainer
#1 lore raw
Quoted 5 lines · Michael S. Tsirkin

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

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]

Quoted 18 lines
---
 include/linux/virtio_ring.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/virtio_ring.h +1 -0
index ca3ad41..b300787 100644
@@ -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>
 
Signature · 1 line
MST