Merge latest b_llp_hp changes onto b_flock

diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c
index d8bffab..d70a4f2 100644 (file)
--- a/lnet/utils/portals.c
+++ b/lnet/utils/portals.c
@@ -45,7 +45,7 @@
 unsigned int portal_debug;
 unsigned int portal_printk;
 unsigned int portal_stack;
-
+unsigned int portal_cerror;
 
 static unsigned int g_nal = 0;
 

diff --git a/lustre/portals/utils/portals.c b/lustre/portals/utils/portals.c
index d8bffab..d70a4f2 100644 (file)
--- a/lustre/portals/utils/portals.c
+++ b/lustre/portals/utils/portals.c
@@ -45,7 +45,7 @@
 unsigned int portal_debug;
 unsigned int portal_printk;
 unsigned int portal_stack;
-
+unsigned int portal_cerror;
 
 static unsigned int g_nal = 0;