svn commit: r278743 - stable/9/sys/dev/cxgb

Garrett Cooper ngie at FreeBSD.org
Sat Feb 14 06:58:29 UTC 2015


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(); \
         } \


More information about the svn-src-stable-9 mailing list