2.6 do not have smp_num_cpus

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 69daa02..7a13396 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -59,7 +59,7 @@
 #include <portals/lib-p30.h>
 
 #if CONFIG_SMP
-# define SOCKNAL_N_SCHED        smp_num_cpus    /* # socknal schedulers */
+# define SOCKNAL_N_SCHED       num_online_cpus() /* # socknal schedulers */
 #else
 # define SOCKNAL_N_SCHED        1               /* # socknal schedulers */
 #endif

diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h
index 69daa02..7a13396 100644 (file)
--- a/lustre/portals/knals/socknal/socknal.h
+++ b/lustre/portals/knals/socknal/socknal.h
@@ -59,7 +59,7 @@
 #include <portals/lib-p30.h>
 
 #if CONFIG_SMP
-# define SOCKNAL_N_SCHED        smp_num_cpus    /* # socknal schedulers */
+# define SOCKNAL_N_SCHED       num_online_cpus() /* # socknal schedulers */
 #else
 # define SOCKNAL_N_SCHED        1               /* # socknal schedulers */
 #endif