Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753479Ab3GHCXK (ORCPT ); Sun, 7 Jul 2013 22:23:10 -0400 Received: from ozlabs.org ([203.10.76.45]:40589 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753384Ab3GHCWP convert rfc822-to-8bit (ORCPT ); Sun, 7 Jul 2013 22:22:15 -0400 From: Rusty Russell To: "Michael S. Tsirkin" , kvm@vger.kernel.org Cc: Wanlong Gao , Asias He , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH] tools/virtio: move module license stub to module.h In-Reply-To: <20130707142944.GA3022@redhat.com> References: <20130707142944.GA3022@redhat.com> User-Agent: Notmuch/0.15.2+81~gd2c8818 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Mon, 08 Jul 2013 11:32:10 +0930 Message-ID: <87li5herml.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1846 Lines: 53 "Michael S. Tsirkin" 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 > --- > 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 > + > +#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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/