From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279Ab0KIQkX (ORCPT ); Tue, 9 Nov 2010 11:40:23 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:50284 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752988Ab0KIQkU (ORCPT ); Tue, 9 Nov 2010 11:40:20 -0500 Date: Tue, 09 Nov 2010 08:40:45 -0800 (PST) Message-Id: <20101109.084045.104069884.davem@davemloft.net> To: dave@gnu.org Cc: robert.olsson@its.uu.se, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH] net: replace min with min_t in pktgen_if_write From: David Miller In-Reply-To: <1289320633.2260.12.camel@cowboy> References: <1289320633.2260.12.camel@cowboy> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id oA9Ged1W023901 From: Davidlohr Bueso Date: Tue, 09 Nov 2010 13:37:13 -0300 > From: Davidlohr Bueso > > This addresses the following compiler (gcc 4.4.5) warning: > > CC [M] net/core/pktgen.o > net/core/pktgen.c: In function pktgen_if_write: > net/core/pktgen.c:890: warning: comparison of distinct pointer types lacks a cast > > Signed-off-by: Davidlohr Bueso Already fixed in net-2.6: commit 86c2c0a8a4965ae5cbc0ff97ed39a4472e8e9b23 Author: Dmitry Torokhov Date: Sat Nov 6 20:11:38 2010 +0000 NET: pktgen - fix compile warning This should fix the following warning: net/core/pktgen.c: In function pktgen_if_write: net/core/pktgen.c:890: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Dmitry Torokhov Reviewed-by: Nelson Elhage Signed-off-by: David S. Miller diff --git a/net/core/pktgen.c b/net/core/pktgen.c index fbce4b0..1992cd0 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -887,7 +887,7 @@ static ssize_t pktgen_if_write(struct file *file, i += len; if (debug) { - size_t copy = min(count, 1023); + size_t copy = min_t(size_t, count, 1023); char tb[copy + 1]; if (copy_from_user(tb, user_buffer, copy)) return -EFAULT; {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH] net: replace min with min_t in pktgen_if_write Date: Tue, 09 Nov 2010 08:40:45 -0800 (PST) Message-ID: <20101109.084045.104069884.davem@davemloft.net> References: <1289320633.2260.12.camel@cowboy> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-7 Content-Transfer-Encoding: base64 Cc: robert.olsson@its.uu.se, linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: dave@gnu.org Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:50284 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752988Ab0KIQkU (ORCPT ); Tue, 9 Nov 2010 11:40:20 -0500 In-Reply-To: <1289320633.2260.12.camel@cowboy> Sender: netdev-owner@vger.kernel.org List-ID: RnJvbTogRGF2aWRsb2hyIEJ1ZXNvIDxkYXZlQGdudS5vcmc+DQpEYXRlOiBUdWUsIDA5IE5vdiAy MDEwIDEzOjM3OjEzIC0wMzAwDQoNCj4gRnJvbTogRGF2aWRsb2hyIEJ1ZXNvIDxkYXZlQGdudS5v cmc+DQo+IA0KPiBUaGlzIGFkZHJlc3NlcyB0aGUgZm9sbG93aW5nIGNvbXBpbGVyIChnY2MgNC40 LjUpIHdhcm5pbmc6DQo+IA0KPiAgIENDIFtNXSAgbmV0L2NvcmUvcGt0Z2VuLm8NCj4gbmV0L2Nv cmUvcGt0Z2VuLmM6IEluIGZ1bmN0aW9uIKFwa3RnZW5faWZfd3JpdGWiOg0KPiBuZXQvY29yZS9w a3RnZW4uYzo4OTA6IHdhcm5pbmc6IGNvbXBhcmlzb24gb2YgZGlzdGluY3QgcG9pbnRlciB0eXBl cyBsYWNrcyBhIGNhc3QNCj4gDQo+IFNpZ25lZC1vZmYtYnk6IERhdmlkbG9ociBCdWVzbyA8ZGF2 ZUBnbnUub3JnPg0KDQpBbHJlYWR5IGZpeGVkIGluIG5ldC0yLjY6DQoNCmNvbW1pdCA4NmMyYzBh OGE0OTY1YWU1Y2JjMGZmOTdlZDM5YTQ0NzJlOGU5YjIzDQpBdXRob3I6IERtaXRyeSBUb3Jva2hv diA8ZG1pdHJ5LnRvcm9raG92QGdtYWlsLmNvbT4NCkRhdGU6ICAgU2F0IE5vdiA2IDIwOjExOjM4 IDIwMTAgKzAwMDANCg0KICAgIE5FVDogcGt0Z2VuIC0gZml4IGNvbXBpbGUgd2FybmluZw0KICAg IA0KICAgIFRoaXMgc2hvdWxkIGZpeCB0aGUgZm9sbG93aW5nIHdhcm5pbmc6DQogICAgDQogICAg bmV0L2NvcmUvcGt0Z2VuLmM6IEluIGZ1bmN0aW9uIKFwa3RnZW5faWZfd3JpdGWiOg0KICAgIG5l dC9jb3JlL3BrdGdlbi5jOjg5MDogd2FybmluZzogY29tcGFyaXNvbiBvZiBkaXN0aW5jdCBwb2lu dGVyIHR5cGVzIGxhY2tzIGEgY2FzdA0KICAgIA0KICAgIFNpZ25lZC1vZmYtYnk6IERtaXRyeSBU b3Jva2hvdiA8ZHRvckBtYWlsLnJ1Pg0KICAgIFJldmlld2VkLWJ5OiBOZWxzb24gRWxoYWdlIDxu ZWxoYWdlQGtzcGxpY2UuY29tPg0KICAgIFNpZ25lZC1vZmYtYnk6IERhdmlkIFMuIE1pbGxlciA8 ZGF2ZW1AZGF2ZW1sb2Z0Lm5ldD4NCg0KZGlmZiAtLWdpdCBhL25ldC9jb3JlL3BrdGdlbi5jIGIv bmV0L2NvcmUvcGt0Z2VuLmMNCmluZGV4IGZiY2U0YjAuLjE5OTJjZDAgMTAwNjQ0DQotLS0gYS9u ZXQvY29yZS9wa3RnZW4uYw0KKysrIGIvbmV0L2NvcmUvcGt0Z2VuLmMNCkBAIC04ODcsNyArODg3 LDcgQEAgc3RhdGljIHNzaXplX3QgcGt0Z2VuX2lmX3dyaXRlKHN0cnVjdCBmaWxlICpmaWxlLA0K IAlpICs9IGxlbjsNCiANCiAJaWYgKGRlYnVnKSB7DQotCQlzaXplX3QgY29weSA9IG1pbihjb3Vu dCwgMTAyMyk7DQorCQlzaXplX3QgY29weSA9IG1pbl90KHNpemVfdCwgY291bnQsIDEwMjMpOw0K IAkJY2hhciB0Yltjb3B5ICsgMV07DQogCQlpZiAoY29weV9mcm9tX3VzZXIodGIsIHVzZXJfYnVm ZmVyLCBjb3B5KSkNCiAJCQlyZXR1cm4gLUVGQVVMVDsNCg==