merge b_devel into HEAD, which will become 0.7.3

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

diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c
index 14cc325..e8eb290 100644 (file)
--- a/lnet/libcfs/module.c
+++ b/lnet/libcfs/module.c
@@ -62,10 +62,10 @@ static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
 struct semaphore nal_cmd_sem;
 
 #ifdef PORTAL_DEBUG
-void
-kportal_assertion_failed (char *expr, char *file, char *func, int line)
+void kportal_assertion_failed(char *expr, char *file, const char *func,
+                              const int line)
 {
-        portals_debug_msg(0, D_EMERG, file, func, line, CDEBUG_STACK(),
+        portals_debug_msg(0, D_EMERG, file, func, line, CDEBUG_STACK,
                           "ASSERTION(%s) failed\n", expr);
         LBUG_WITH_LOC(file, func, line);
 }