[PATCH] SLAB: Fix slab_test.c CONFIG_CPUMASK_OFFSTACK build

[Pekka Enberg]

Stephen Rothwell reported the following build breakage:

  Today's linux-next build (x86_64 allmodconfig) failed like this:

  tests/slab_test.c: In function 'test_func':
  tests/slab_test.c:176: error: implicit declaration of function 'set_cpus_allowed'

  Caused by commit 1c999557258d251e2e5790de4b723d5996c06d5d ("Add slab
  performance tests").

  set_cpus_allowed it now only defined if CONFIG_CPUMASK_OFFSTACK is not
  set.  This was changed by commit e0ad955680878998ff7dc51ce06ddad12260423a
  ("cpumask: don't define set_cpus_allowed() if CONFIG_CPUMASK_OFFSTACK=y")
  which entered Linus' tree before 2.6.32-rc1.

Fix that up.

Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
---
 tests/slab_test.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/slab_test.c b/tests/slab_test.c
index e97afc4..0d23dc1 100644
--- a/tests/slab_test.c
+++ b/tests/slab_test.c
@@ -170,10 +170,13 @@ static int started;
 static int test_func(void *private)
 {
 	struct test_struct *t = private;
-	cpumask_t newmask = CPU_MASK_NONE;
+	cpumask_var_t newmask;
 
-        cpu_set(t->cpu, newmask);
-        set_cpus_allowed(current, newmask);
+	if (!alloc_cpumask_var(&newmask, GFP_KERNEL))
+		return -ENOMEM;
+
+        cpumask_set_cpu(t->cpu, newmask);
+        set_cpus_allowed_ptr(current, newmask);
 	t->v = kzalloc(t->count * sizeof(void *), GFP_KERNEL);
 
 	atomic_inc(&tests_running);
@@ -188,6 +191,7 @@ static int test_func(void *private)
 		t->test_p2(t);
 	t->stop2 = get_cycles();
 	kfree(t->v);
+	free_cpumask_var(newmask);
 	atomic_dec(&tests_running);
 	set_current_state(TASK_UNINTERRUPTIBLE);
 	schedule();
-- 
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/