set_cpus_allowed is not available with CONFIG_CPUMASK_OFFSTACK on.
We should call set_cpus_allowed_ptr instead.
Reported-by: Stephen Rothwell <s...@canb.auug.org.au>
Signed-off-by: Peng Tao <tao.p...@emc.com>
Signed-off-by: Andreas Dilger <andreas.dil...@intel.com>
---
.../lustre/include/linux/libcfs/linux/linux-prim.h | 2 --
.../include/linux/libcfs/linux/portals_compat25.h | 2 --
.../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +-
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 ++--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index c346bcd..a4963a8 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/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
*/
diff --git
a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
index 2b94872..132a4be 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/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 */
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
index 6e255ff..95142d1 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
+++ b/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 */
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
index 185841f..5a66a1b 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
+++ b/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
--
1.7.9.5
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
