From owner-svn-src-all@FreeBSD.ORG  Sat Feb 14 06:58:28 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED02675F;
 Sat, 14 Feb 2015 06:58:28 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7A339F0;
 Sat, 14 Feb 2015 06:58:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1E6wSCh072413;
 Sat, 14 Feb 2015 06:58:28 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1E6wScp072412;
 Sat, 14 Feb 2015 06:58:28 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502140658.t1E6wScp072412@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 14 Feb 2015 06:58:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r278743 - stable/9/sys/dev/cxgb
X-SVN-Group: stable-9
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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 06:58:29 -0000

Author: ngie
Date: Sat Feb 14 06:58:27 2015
New Revision: 278743
URL: https://svnweb.freebsd.org/changeset/base/278743

Log:
  MFC r278364:
  
  r278364:
  
    Remove kdb_backtrace extern; get the definition for kdb_backtrace from
    <sys/kdb.h> instead
  
    Fix whitespace in WARN_ON macro definition
  
    Reviewed by: np
    Differential Revision: https://reviews.freebsd.org/D1799
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/9/sys/dev/cxgb/cxgb_osdep.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/cxgb/cxgb_osdep.h
==============================================================================
--- stable/9/sys/dev/cxgb/cxgb_osdep.h	Sat Feb 14 06:19:24 2015	(r278742)
+++ stable/9/sys/dev/cxgb/cxgb_osdep.h	Sat Feb 14 06:58:27 2015	(r278743)
@@ -39,6 +39,8 @@ $FreeBSD$
 #include <sys/lock.h>
 #include <sys/mutex.h>
 
+#include <sys/kdb.h>
+
 #include <dev/mii/mii.h>
 
 #ifndef _CXGB_OSDEP_H_
@@ -128,10 +130,8 @@ void prefetch(void *x) 
 #define smp_mb() mb()
 
 #define L1_CACHE_BYTES 128
-extern void kdb_backtrace(void);
-
 #define WARN_ON(condition) do { \
-       if (__predict_false((condition)!=0)) {  \
+	if (__predict_false((condition)!=0)) {  \
                 log(LOG_WARNING, "BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \
                 kdb_backtrace(); \
         } \