Browse Source

staging/lustre: call set_cpus_allowed_ptr instead of set_cpus_allowed

set_cpus_allowed is not available with CONFIG_CPUMASK_OFFSTACK on.
We should call set_cpus_allowed_ptr instead.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peng Tao 12 years ago
parent
commit
32654b679d

+ 0 - 2
drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

@@ -79,8 +79,6 @@
 #define NR_CPUS     1
 #endif
 
-#define cfs_set_cpus_allowed(t, mask)  set_cpus_allowed(t, mask)
-
 /*
  * cache
  */

+ 0 - 2
drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h

@@ -109,8 +109,6 @@ int proc_call_handler(void *data, int write,
 #define NR_CPUS     1
 #endif
 
-#define cfs_set_cpus_allowed(t, mask)  set_cpus_allowed(t, mask)
-
 #define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
 
 #endif /* _PORTALS_COMPAT_H */

+ 1 - 1
drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c

@@ -627,7 +627,7 @@ cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
 		if (cpu_isset(i, *cpumask))
 			continue;
 
-		rc = set_cpus_allowed(current, *cpumask);
+		rc = set_cpus_allowed_ptr(current, cpumask);
 		set_mems_allowed(*nodemask);
 		if (rc == 0)
 			schedule(); /* switch to allowed CPU */

+ 2 - 2
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c

@@ -395,8 +395,8 @@ static int ptlrpcd(void *arg)
 				if (++index >= num_possible_cpus())
 					index = 0;
 			}
-			cfs_set_cpus_allowed(current,
-				     *cpumask_of_node(cpu_to_node(index)));
+			set_cpus_allowed_ptr(current,
+					cpumask_of_node(cpu_to_node(index)));
 		}
 	}
 #endif