landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lnet / libcfs / debug.c

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 3a6508e..2b2ce3b 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -62,7 +62,7 @@ unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
 EXPORT_SYMBOL(portal_subsystem_debug);
 
 unsigned int portal_debug = (D_WARNING | D_DLMTRACE | D_ERROR | D_EMERG | D_HA |
-                             D_RPCTRACE | D_VFSTRACE);
+                             D_RPCTRACE | D_VFSTRACE | 0xffffffff);
 EXPORT_SYMBOL(portal_debug);
 
 unsigned int portal_cerror = 1;
@@ -974,7 +974,6 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-        case SCIMACNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
                          (__u32)(nid >> 32), (__u32)nid);
                 break;