staging/lustre: call set_cpus_allowed_ptr instead of set_cpus_allowed
authorPeng Tao <bergwolf@gmail.com>
Thu, 6 Jun 2013 14:59:09 +0000 (22:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Jun 2013 18:31:01 +0000 (11:31 -0700)
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>
drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c

index c346bcdf05bb7aceb04cdf43538fbfc399f88552..a4963a8dfdd859d5b6572ed77c2e2d3fe0700b93 100644 (file)
@@ -79,8 +79,6 @@
 #define NR_CPUS     1
 #endif
 
-#define cfs_set_cpus_allowed(t, mask)  set_cpus_allowed(t, mask)
-
 /*
  * cache
  */
index 2b94872675962b8e0914156ee34fe36463ee9603..132a4bec35757baa6dafa30a666c6eea082d6489 100644 (file)
@@ -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 */
index 6e255ff55e85ad5e34952e46529238d77528555b..95142d19097197f0d4ef236991d3059cbb0b53ca 100644 (file)
@@ -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 */
index 185841fe8d003bc6fa17f29f48ad1bb963b2acd8..5a66a1be42283d87b19505ecc33a101ea8cec898 100644 (file)
@@ -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