[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20140514081331.GZ23991@suse.de>
Date: Wed, 14 May 2014 09:13:31 +0100
From: Mel Gorman <mgorman@...e.de>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-next@...r.kernel.org,
Stephen Rothwell <sfr@...b.auug.org.au>,
linux-kernel@...r.kernel.org, Rik van Riel <riel@...hat.com>
Subject: Re: linux-next: build failure after merge of the akpm-current tree
number_of_cpusets -fix
Stephen Rothwell reported the following build failure on -next.
In file included from arch/powerpc/mm/numa.c:23:0:
include/linux/cpuset.h: In function 'cpusets_enabled':
include/linux/cpuset.h:21:2: error: implicit declaration of function 'static_key_false' [-Werror=implicit-function-declaration]
return static_key_false(&cpusets_enabled_key);
^
include/linux/cpuset.h: In function 'nr_cpusets':
include/linux/cpuset.h:27:2: error: implicit declaration of function 'static_key_count' [-Werror=implicit-function-declaration]
return static_key_count(&cpusets_enabled_key) + 1;
^
include/linux/cpuset.h: In function 'cpuset_inc':
include/linux/cpuset.h:32:2: error: implicit declaration of function 'static_key_slow_inc' [-Werror=implicit-function-declaration]
static_key_slow_inc(&cpusets_enabled_key);
^
include/linux/cpuset.h: In function 'cpuset_dec':
include/linux/cpuset.h:37:2: error: implicit declaration of function 'static_key_slow_dec' [-Werror=implicit-function-declaration]
static_key_slow_dec(&cpusets_enabled_key);
^
This is a fix to the mmotm patch mm-page_alloc-use-jump-labels-to-avoid-checking-number_of_cpusets.patch.
Signed-off-by: Mel Gorman <mgorman@...e.de>
---
include/linux/cpuset.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index a94af76..ade2390 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -12,6 +12,7 @@
#include <linux/cpumask.h>
#include <linux/nodemask.h>
#include <linux/mm.h>
+#include <linux/jump_label.h>
#ifdef CONFIG_CPUSETS
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists