From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] xen/xenbus: silence GCC warning Date: Mon, 15 Oct 2012 09:20:52 -0400 Message-ID: <20121015132052.GD4000@phenom.dumpdata.com> References: <1350295389.1516.27.camel@x61.thuisdomein> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1350295389.1516.27.camel@x61.thuisdomein> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Paul Bolle Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, "H. Peter Anvin" List-Id: virtualization@lists.linuxfoundation.org T24gTW9uLCBPY3QgMTUsIDIwMTIgYXQgMTI6MDM6MDlQTSArMDIwMCwgUGF1bCBCb2xsZSB3cm90 ZToKPiBDb21waWxpbmcgeGVuYnVzX3hzLm8gdHJpZ2dlcnMgdGhpcyBHQ0Mgd2FybmluZzoKPiAg ICAgZHJpdmVycy94ZW4veGVuYnVzL3hlbmJ1c194cy5jOjYyODoxMzogd2FybmluZzogZnVuY3Rp b24gZGVjbGFyYXRpb24gaXNu4oCZdCBhIHByb3RvdHlwZSBbLVdzdHJpY3QtcHJvdG90eXBlc10K PiAKPiBBZGQgdGhlIG9idmlvdXMgYW5kIHRyaXZpYWwgZml4LgoKSSBhbHJlYWR5IGdvdCB0aGUg Zml4IGZvciB0aGlzIGluIG15IHRyZWUuIFRoYW5rcyEKCj4gCj4gV2hpbGUgd2UncmUgdG91Y2hp bmcgdGhpcyBmdW5jdGlvbiBhZGQgc29tZSBlcXVhbGx5IG9idmlvdXMgYW5kIHRyaXZpYWwKPiB3 aGl0ZXNwYWNlIGZpeGVzLgo+IAo+IFNpZ25lZC1vZmYtYnk6IFBhdWwgQm9sbGUgPHBlYm9sbGVA dGlzY2FsaS5ubD4KPiAtLS0KPiAwKSBUcmlnZ2VyZWQgYnkgY29tcGlsaW5nIHYzLjctcmMxIHVz aW5nIChiYXNpY2FsbHkpIEZlZG9yYSAxNydzIGN1cnJlbnQKPiBjb25maWcuIENvbXBpbGUgdGVz dGVkIG9ubHkuCj4gCj4gMSkgT2JsaWdhdG9yeSByZWZlcmVuY2U6IGh0dHBzOi8vbHduLm5ldC9B cnRpY2xlcy80ODc0OTMvIC4KPiAKPiAgZHJpdmVycy94ZW4veGVuYnVzL3hlbmJ1c194cy5jIHwg NSArKystLQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3hzLmMgYi9kcml2 ZXJzL3hlbi94ZW5idXMveGVuYnVzX3hzLmMKPiBpbmRleCA0ODIyMGUxLi43YTJiMGRhIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5idXNfeHMuYwo+ICsrKyBiL2RyaXZlcnMv eGVuL3hlbmJ1cy94ZW5idXNfeHMuYwo+IEBAIC02MTksMTMgKzYxOSwxNCBAQCBzdGF0aWMgc3Ry dWN0IHhlbmJ1c193YXRjaCAqZmluZF93YXRjaChjb25zdCBjaGFyICp0b2tlbikKPiAgCj4gIAly ZXR1cm4gTlVMTDsKPiAgfQo+ICsKPiAgLyoKPiAgICogQ2VydGFpbiBvbGRlciBYZW5CdXMgdG9v bHN0YWNrIGNhbm5vdCBoYW5kbGUgcmVhZGluZyB2YWx1ZXMgdGhhdCBhcmUKPiAgICogbm90IHBv cHVsYXRlZC4gU29tZSBYZW4gMy40IGluc3RhbGxhdGlvbiBhcmUgaW5jYXBhYmxlIG9mIGRvaW5n IHRoaXMKPiAgICogc28gaWYgd2UgYXJlIHJ1bm5pbmcgb24gYW55dGhpbmcgb2xkZXIgdGhhbiA0 IGRvIG5vdCBhdHRlbXB0IHRvIHJlYWQKPiAgICogY29udHJvbC9wbGF0Zm9ybS1mZWF0dXJlLXhz X3Jlc2V0X3dhdGNoZXMuCj4gICAqLwo+IC1zdGF0aWMgYm9vbCB4ZW5fc3RyaWN0X3hlbmJ1c19x dWlyaygpCj4gK3N0YXRpYyBib29sIHhlbl9zdHJpY3RfeGVuYnVzX3F1aXJrKHZvaWQpCj4gIHsK PiAgCXVpbnQzMl90IGVheCwgZWJ4LCBlY3gsIGVkeCwgYmFzZTsKPiAgCj4gQEAgLTYzNSw4ICs2 MzYsOCBAQCBzdGF0aWMgYm9vbCB4ZW5fc3RyaWN0X3hlbmJ1c19xdWlyaygpCj4gIAlpZiAoKGVh eCA+PiAxNikgPCA0KQo+ICAJCXJldHVybiB0cnVlOwo+ICAJcmV0dXJuIGZhbHNlOwo+IC0KPiAg fQo+ICsKPiAgc3RhdGljIHZvaWQgeHNfcmVzZXRfd2F0Y2hlcyh2b2lkKQo+ICB7Cj4gIAlpbnQg ZXJyLCBzdXBwb3J0ZWQgPSAwOwo+IC0tIAo+IDEuNy4xMS43Cl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlzdApW aXJ0dWFsaXphdGlvbkBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxp bnV4Zm91bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby92aXJ0dWFsaXphdGlvbg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507Ab2JONdF (ORCPT ); Mon, 15 Oct 2012 09:33:05 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:37204 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753227Ab2JONdD convert rfc822-to-8bit (ORCPT ); Mon, 15 Oct 2012 09:33:03 -0400 Date: Mon, 15 Oct 2012 09:20:52 -0400 From: Konrad Rzeszutek Wilk To: Paul Bolle Cc: Jeremy Fitzhardinge , "H. Peter Anvin" , xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] xen/xenbus: silence GCC warning Message-ID: <20121015132052.GD4000@phenom.dumpdata.com> References: <1350295389.1516.27.camel@x61.thuisdomein> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1350295389.1516.27.camel@x61.thuisdomein> User-Agent: Mutt/1.5.21 (2010-09-15) Content-Transfer-Encoding: 8BIT X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 15, 2012 at 12:03:09PM +0200, Paul Bolle wrote: > Compiling xenbus_xs.o triggers this GCC warning: > drivers/xen/xenbus/xenbus_xs.c:628:13: warning: function declaration isn’t a prototype [-Wstrict-prototypes] > > Add the obvious and trivial fix. I already got the fix for this in my tree. Thanks! > > While we're touching this function add some equally obvious and trivial > whitespace fixes. > > Signed-off-by: Paul Bolle > --- > 0) Triggered by compiling v3.7-rc1 using (basically) Fedora 17's current > config. Compile tested only. > > 1) Obligatory reference: https://lwn.net/Articles/487493/ . > > drivers/xen/xenbus/xenbus_xs.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c > index 48220e1..7a2b0da 100644 > --- a/drivers/xen/xenbus/xenbus_xs.c > +++ b/drivers/xen/xenbus/xenbus_xs.c > @@ -619,13 +619,14 @@ static struct xenbus_watch *find_watch(const char *token) > > return NULL; > } > + > /* > * Certain older XenBus toolstack cannot handle reading values that are > * not populated. Some Xen 3.4 installation are incapable of doing this > * so if we are running on anything older than 4 do not attempt to read > * control/platform-feature-xs_reset_watches. > */ > -static bool xen_strict_xenbus_quirk() > +static bool xen_strict_xenbus_quirk(void) > { > uint32_t eax, ebx, ecx, edx, base; > > @@ -635,8 +636,8 @@ static bool xen_strict_xenbus_quirk() > if ((eax >> 16) < 4) > return true; > return false; > - > } > + > static void xs_reset_watches(void) > { > int err, supported = 0; > -- > 1.7.11.7