Re: [PATCH] tools/virtio: move module license stub to module.h

[Rusty Russell]

"Michael S. Tsirkin" <mst@xxxxxxxxxx> writes:
> 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@xxxxxxxxxx>
> ---
>  tools/virtio/linux/module.h | 5 +++++
>  tools/virtio/linux/virtio.h | 3 ---
>  2 files changed, 5 insertions(+), 3 deletions(-)

Applied, thanks.

Cheers,
Rusty.

> 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[],
> -- 
> MST
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/