diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-07-08 11:31:10 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-09 10:47:53 +0930 |
| commit | 80390df8b263f1f6b7acb1df35a758736e3ec961 (patch) | |
| tree | cb845dcd5f680bc3e9cec15476817cfe8cbdc45f /tools/virtio | |
| parent | c5610a5d7188b90fe0f927d2513bf684fb0bc427 (diff) | |
| download | op-kernel-dev-80390df8b263f1f6b7acb1df35a758736e3ec961.zip op-kernel-dev-80390df8b263f1f6b7acb1df35a758736e3ec961.tar.gz | |
tools/virtio: move module license stub to module.h
This fixes build for the vringh test:
[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 vringh.o ../../drivers/vhost/vringh.c
../../drivers/vhost/vringh.c:1010:16: error: expected declaration
specifiers or ‘...’ before string constant
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'tools/virtio')
| -rw-r--r-- | tools/virtio/linux/module.h | 5 | ||||
| -rw-r--r-- | tools/virtio/linux/virtio.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/virtio/linux/module.h b/tools/virtio/linux/module.h index 3039a7e..28ce95a 100644 --- a/tools/virtio/linux/module.h +++ b/tools/virtio/linux/module.h @@ -1 +1,6 @@ #include <linux/export.h> + +#define MODULE_LICENSE(__MODULE_LICENSE_value) \ + static __attribute__((unused)) const char *__MODULE_LICENSE_name = \ + __MODULE_LICENSE_value + diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h index cd80183..8447830 100644 --- a/tools/virtio/linux/virtio.h +++ b/tools/virtio/linux/virtio.h @@ -45,9 +45,6 @@ struct virtqueue { void *priv; }; -#define MODULE_LICENSE(__MODULE_LICENSE_value) \ - const char *__MODULE_LICENSE_name = __MODULE_LICENSE_value - /* Interfaces exported by virtio_ring. */ int virtqueue_add_sgs(struct virtqueue *vq, struct scatterlist *sgs[], |
