From owner-svn-src-all@FreeBSD.ORG Mon Feb 17 20:45:40 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69199BA2; Mon, 17 Feb 2014 20:45:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 51E401F58; Mon, 17 Feb 2014 20:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HKjeRY042482; Mon, 17 Feb 2014 20:45:40 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HKjeNp042481; Mon, 17 Feb 2014 20:45:40 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201402172045.s1HKjeNp042481@svn.freebsd.org> From: Dimitry Andric Date: Mon, 17 Feb 2014 20:45:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262132 - stable/10/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 17 Feb 2014 20:45:40 -0000 Author: dim Date: Mon Feb 17 20:45:39 2014 New Revision: 262132 URL: http://svnweb.freebsd.org/changeset/base/262132 Log: MFC r261907: In cxgbe, conditionalize the t4_pgprot_wc() function, since it is only used when DOT5 is defined. Reviewed by: np Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/provider.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/provider.c ============================================================================== --- stable/10/sys/dev/cxgbe/iw_cxgbe/provider.c Mon Feb 17 20:37:15 2014 (r262131) +++ stable/10/sys/dev/cxgbe/iw_cxgbe/provider.c Mon Feb 17 20:45:39 2014 (r262132) @@ -113,10 +113,12 @@ static struct ib_ucontext *c4iw_alloc_uc return &context->ibucontext; } +#ifdef DOT5 static inline pgprot_t t4_pgprot_wc(pgprot_t prot) { return pgprot_writecombine(prot); } +#endif static int c4iw_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) {