Branch HEAD

b=20736
i=alexey.lyashkov
i=dmitry.zogin

Fix compilation with CONFIG_SMP off.

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index b458a8a..dff36d3 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -2034,7 +2034,7 @@ static int ptlrpc_hr_main(void *arg)
                  "ptlrpc_hr_%d", hr_args->thread_index);
 
         cfs_daemonize_ctxt(threadname);
-#if defined(HAVE_NODE_TO_CPUMASK)
+#if defined(CONFIG_SMP) && defined(HAVE_NODE_TO_CPUMASK)
         set_cpus_allowed(cfs_current(),
                          node_to_cpumask(cpu_to_node(hr_args->cpu_index)));
 #endif
@@ -2116,7 +2116,7 @@ static int ptlrpc_start_hr_threads(struct ptlrpc_hr_service *hr)
         LASSERT(hr->hr_n_threads > 0);
 
         for (n = 0, cpu = 0; n < hr->hr_n_threads; n++) {
-#if defined(HAVE_NODE_TO_CPUMASK)
+#if defined(CONFIG_SMP) && defined(HAVE_NODE_TO_CPUMASK)
                 while(!cpu_online(cpu)) {
                         cpu++;
                         if (cpu >= num_possible_cpus())