[ewg] [PULL][OFED 3.18] 7.1 compat patches for OFED BZ 2531
Vladimir Sokolovsky
vlad at dev.mellanox.co.il
Wed Apr 15 08:14:01 PDT 2015
On 15/04/15 16:12, Marciniszyn, Mike wrote:
> Please pull from these fixes from ~mmarciniszyn/scm/new_ofed/compat from the for-ofed-3.18 branch:
>
> commit 52df7d8c70400e3eefb946f99a4886719e15552e
> Author: Mike Marciniszyn <mike.marciniszyn at intel.com>
> Date: Wed Apr 15 08:54:34 2015 -0400
>
> compat: detect cpumask_set_cpu_local_first
>
> RHEL 7.1 exports cpumask_set_cpu_local_first. compat's
> autoconf needs to detect and avoid the duplicate
> symbol.
>
> This addresses OFED BZ 2531.
>
> Signed-off-by: Mike Marciniszyn <mike.marciniszyn at intel.com>
>
Hi Mike,
I pushed another fix for this issue already:
diff --git a/compat/compat-3.16.c b/compat/compat-3.16.c
index 6c840f7..b57c041 100644
--- a/compat/compat-3.16.c
+++ b/compat/compat-3.16.c
@@ -20,6 +20,7 @@
* Returns 0 on success, -ENOMEM for no memory, and -EAGAIN when failed to set
* the cpu bit and need to re-call the function.
*/
+#define cpumask_set_cpu_local_first LINUX_BACKPORT(cpumask_set_cpu_local_first)
int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp)
{
cpumask_var_t mask;
diff --git a/include/linux/compat-3.16.h b/include/linux/compat-3.16.h
index cff1f5b..db79f32 100644
--- a/include/linux/compat-3.16.h
+++ b/include/linux/compat-3.16.h
@@ -7,6 +7,8 @@
#include <linux/cpumask.h>
+#define cpumask_set_cpu_local_first LINUX_BACKPORT(cpumask_set_cpu_local_first)
+
#if NR_CPUS == 1
static inline int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp)
{
Thanks,
Vladimir
More information about the ewg
mailing list