forked from Minki/linux
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>
This commit is contained in:
parent
f2c3d80097
commit
32654b679d
@ -79,8 +79,6 @@
|
|||||||
#define NR_CPUS 1
|
#define NR_CPUS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define cfs_set_cpus_allowed(t, mask) set_cpus_allowed(t, mask)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* cache
|
* cache
|
||||||
*/
|
*/
|
||||||
|
@ -109,8 +109,6 @@ int proc_call_handler(void *data, int write,
|
|||||||
#define NR_CPUS 1
|
#define NR_CPUS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define cfs_set_cpus_allowed(t, mask) set_cpus_allowed(t, mask)
|
|
||||||
|
|
||||||
#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
|
#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
|
||||||
|
|
||||||
#endif /* _PORTALS_COMPAT_H */
|
#endif /* _PORTALS_COMPAT_H */
|
||||||
|
@ -627,7 +627,7 @@ cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
|
|||||||
if (cpu_isset(i, *cpumask))
|
if (cpu_isset(i, *cpumask))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
rc = set_cpus_allowed(current, *cpumask);
|
rc = set_cpus_allowed_ptr(current, cpumask);
|
||||||
set_mems_allowed(*nodemask);
|
set_mems_allowed(*nodemask);
|
||||||
if (rc == 0)
|
if (rc == 0)
|
||||||
schedule(); /* switch to allowed CPU */
|
schedule(); /* switch to allowed CPU */
|
||||||
|
@ -395,8 +395,8 @@ static int ptlrpcd(void *arg)
|
|||||||
if (++index >= num_possible_cpus())
|
if (++index >= num_possible_cpus())
|
||||||
index = 0;
|
index = 0;
|
||||||
}
|
}
|
||||||
cfs_set_cpus_allowed(current,
|
set_cpus_allowed_ptr(current,
|
||||||
*cpumask_of_node(cpu_to_node(index)));
|
cpumask_of_node(cpu_to_node(index)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user