diff --git a/lnet/include/libcfs/darwin/kp30.h b/lnet/include/libcfs/darwin/kp30.h
index 885a78a5760086e895e4f80d2b437460b6540595..7f765e17d420205c8332cbee4e690e4a0d31a56d 100644
--- a/lnet/include/libcfs/darwin/kp30.h
+++ b/lnet/include/libcfs/darwin/kp30.h
@@ -19,29 +19,29 @@
#include <sys/conf.h>
#include <miscfs/devfs/devfs.h>
#include <stdarg.h>
-
+
#include <libcfs/darwin/darwin-lock.h>
#include <libcfs/darwin/darwin-prim.h>
#include <portals/p30.h>
-
+
#define our_cond_resched() schedule_timeout(1);
-
+
#ifdef CONFIG_SMP
#define LASSERT_SPIN_LOCKED(lock) do {} while(0) /* XXX */
#else
#define LASSERT_SPIN_LOCKED(lock) do {} while(0)
#endif
-
+
#define LBUG_WITH_LOC(file, func, line) do {} while(0)
/* --------------------------------------------------------------------- */
#define PORTAL_SYMBOL_REGISTER(x) cfs_symbol_register(#x, &x)
#define PORTAL_SYMBOL_UNREGISTER(x) cfs_symbol_unregister(#x)
-
+
#define PORTAL_SYMBOL_GET(x) ((typeof(&x))cfs_symbol_get(#x))
#define PORTAL_SYMBOL_PUT(x) cfs_symbol_put(#x)
-
+
#define PORTAL_MODULE_USE do{int i = 0; i++;}while(0)
#define PORTAL_MODULE_UNUSE do{int i = 0; i--;}while(0)
diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h
index 344264d363a37f8026aebe6832db8fa8e246e30b..e588c455c5589c0f042dfc2cbe3c661dbe8523b6 100644
--- a/lnet/include/libcfs/linux/kp30.h
+++ b/lnet/include/libcfs/linux/kp30.h
@@ -110,30 +110,30 @@ do { \
#endif /* __arch_um__ */
/* ------------------------------------------------------------------- */
-
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-
+
#define PORTAL_SYMBOL_REGISTER(x) inter_module_register(#x, THIS_MODULE, &x)
#define PORTAL_SYMBOL_UNREGISTER(x) inter_module_unregister(#x)
-
+
#define PORTAL_SYMBOL_GET(x) ((typeof(&x))inter_module_get(#x))
#define PORTAL_SYMBOL_PUT(x) inter_module_put(#x)
-
+
#define PORTAL_MODULE_USE MOD_INC_USE_COUNT
#define PORTAL_MODULE_UNUSE MOD_DEC_USE_COUNT
#else
-
+
#define PORTAL_SYMBOL_REGISTER(x)
#define PORTAL_SYMBOL_UNREGISTER(x)
-
+
#define PORTAL_SYMBOL_GET(x) symbol_get(x)
#define PORTAL_SYMBOL_PUT(x) symbol_put(x)
-
+
#define PORTAL_MODULE_USE try_module_get(THIS_MODULE)
#define PORTAL_MODULE_UNUSE module_put(THIS_MODULE)
-
+
#endif
-
+
/******************************************************************************/
#if (__GNUC__)
diff --git a/lnet/include/libcfs/linux/portals_compat25.h b/lnet/include/libcfs/linux/portals_compat25.h
index 148a40104e7d7fdbe942f9ac7306a83d73eea085..31658d5f77c0dc20eb236d803d57b29b89adcdf4 100644
--- a/lnet/include/libcfs/linux/portals_compat25.h
+++ b/lnet/include/libcfs/linux/portals_compat25.h
@@ -86,10 +86,10 @@
#endif
#ifndef HAVE_CPU_ONLINE
-#define cpu_online(cpu) (test_bit(cpu_online_map, &(cpu)))
+#define cpu_online(cpu) test_bit(cpu, &(cpu_online_map))
#endif
#ifndef HAVE_CPUMASK_T
-#define cpu_set(cpu, map) (set_bit(cpu, &(map)))
+#define cpu_set(cpu, map) set_bit(cpu, &(map))
typedef unsigned long cpumask_t;
#endif
diff --git a/lnet/libcfs/watchdog.c b/lnet/libcfs/watchdog.c
index 53b59030d531dab989a2864f0ac09277b05de4c5..a873da79834b36e783e855f64e4fa95f9537f71e 100644
--- a/lnet/libcfs/watchdog.c
+++ b/lnet/libcfs/watchdog.c
@@ -254,7 +254,7 @@ static void lcw_dispatch_stop(void)
EXIT;
}
-struct lc_watchdog *lc_watchdog_add(int time,
+struct lc_watchdog *lc_watchdog_add(int timeout_ms,
void (*callback)(struct lc_watchdog *,
struct task_struct *,
void *),
@@ -271,7 +271,7 @@ struct lc_watchdog *lc_watchdog_add(int time,
lcw->lcw_task = cfs_current();
lcw->lcw_pid = cfs_curproc_pid();
- lcw->lcw_time = (time * HZ) / 1000;
+ lcw->lcw_time = (timeout_ms * HZ) / 1000;
lcw->lcw_callback = callback ? callback : lc_watchdog_dumplog;
lcw->lcw_data = data;
lcw->lcw_state = LC_WATCHDOG_DISABLED;