From owner-svn-src-all@freebsd.org Tue Jan 26 15:43:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D4C5A6EDB0; Tue, 26 Jan 2016 15:43:21 +0000 (UTC) (envelope-from nparhar@gmail.com) Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com [IPv6:2607:f8b0:400e:c00::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E29D01BDE; Tue, 26 Jan 2016 15:43:20 +0000 (UTC) (envelope-from nparhar@gmail.com) Received: by mail-pf0-x230.google.com with SMTP id q63so103362937pfb.1; Tue, 26 Jan 2016 07:43:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=9Z0NOVw8oUXuI+x7j5OStC9FBM6IKtjgfN84F63dC6s=; b=SmjaZwIW+PPCuajXyDPfeaSryAIuQzs/MGv+ptxwix/glsBlTPaB2WkVYRF2nxfxxO 48muyfyhlAVWFIawm0u2YSMftW3cI5IvzDsmekWNdo6toYMyDAzsckYebxiJgwoKHuGi l57PfBQYsyxjSLwl8Bl4QcEFBPsUxU0r2jdcBKMLOAyfTOrX0TvVWBFLcJJIbJtUAVWk mDqMrlovJjHKXVkKzUxKGafNgy1w8PeY9vA8jCXphLbdzNR9v2FyeQDi9G9wb1EnNbik ubg/uk5nYLFpmlaBK5ScxMfeJNI5JB71PuctJpdc/Py7qKznXzX//XaBAP+PD0RlI1Dh G2wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=9Z0NOVw8oUXuI+x7j5OStC9FBM6IKtjgfN84F63dC6s=; b=QCigZvRplYj7yJLMdSzO1Rp56mKLAUE5qicF5Dej1LVQhd5CI8IRzUGWQ9x9xtiskJ DKUHdmV1UwwNS0U4CHT4ipzWk0eaqrFTNwaihmtUeIh46UOPuAGH1ZOYcc8/fhJiZA61 29eKASGvIajHM3uBspAD2wHlmarospiMOqfC9YZMHPSpzU65zlafsH+WwdlqEK+0DCgh 21cUnzdbQMJKKewEsQJVdltG1eBcQlvCn7TDyi69Gqt4yHe4yi1uXRA67QawM1oY/8eS OME3POuFvQXg7Wizmvbi+8BK9kAQCglFmeUy1aZb2wp4/Ffw+Ofem4gmeS1iLP86iryT UsTQ== X-Gm-Message-State: AG10YOQmwE2HYvqzkCxlspJx2djJPvv9tL0DQ/AUjAwGYJ6yyQilwU6U1Rh4YOZA1wqH1A== X-Received: by 10.98.89.139 with SMTP id k11mr35119513pfj.82.1453823000532; Tue, 26 Jan 2016 07:43:20 -0800 (PST) Received: from ox ([2601:641:c001:8a00:cd37:2eca:7ecc:734f]) by smtp.gmail.com with ESMTPSA id y26sm2638720pfi.88.2016.01.26.07.43.18 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 26 Jan 2016 07:43:19 -0800 (PST) Sender: Navdeep Parhar Date: Tue, 26 Jan 2016 07:43:12 -0800 From: Navdeep Parhar To: Hans Petter Selasky Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r294839 - in head/sys: compat/linuxkpi/common/include/asm compat/linuxkpi/common/include/linux dev/cxgb Message-ID: <20160126154312.GD2170@ox> Mail-Followup-To: Hans Petter Selasky , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201601261526.u0QFQatQ063359@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201601261526.u0QFQatQ063359@repo.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2016 15:43:21 -0000 On Tue, Jan 26, 2016 at 03:26:36PM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Tue Jan 26 15:26:35 2016 > New Revision: 294839 > URL: https://svnweb.freebsd.org/changeset/base/294839 > > Log: > Update and add various macros to the LinuxKPI and resolve a macro > redefinition issue in the cxgb driver. > > MFC after: 1 week > Sponsored by: Mellanox Technologies > Reviewed by: np @ ^^^^ only the cxgb_osdep.h part. Regards, Navdeep > > Modified: > head/sys/compat/linuxkpi/common/include/asm/atomic.h > head/sys/compat/linuxkpi/common/include/linux/clocksource.h > head/sys/compat/linuxkpi/common/include/linux/completion.h > head/sys/compat/linuxkpi/common/include/linux/gfp.h > head/sys/compat/linuxkpi/common/include/linux/kernel.h > head/sys/dev/cxgb/cxgb_osdep.h > > > > Modified: head/sys/dev/cxgb/cxgb_osdep.h > ============================================================================== > --- head/sys/dev/cxgb/cxgb_osdep.h Tue Jan 26 15:22:04 2016 (r294838) > +++ head/sys/dev/cxgb/cxgb_osdep.h Tue Jan 26 15:26:35 2016 (r294839) > @@ -231,7 +231,9 @@ static const int debug_flags = DBG_RX; > #define le16_to_cpu(x) le16toh(x) > #define cpu_to_le32(x) htole32(x) > #define swab32(x) bswap32(x) > -#define simple_strtoul strtoul > +#ifndef simple_strtoul > +#define simple_strtoul(...) strtoul(__VA_ARGS__) > +#endif > > > #ifndef LINUX_TYPES_DEFINED >