aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/topology.h
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2015-09-22 14:21:16 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-09-23 09:18:56 +0200
commit22be9cd9f22a4b2acc5fe6666ca23206ebe4d495 (patch)
tree20fd93a283a4fcd5686dd725b94ebec3346e4e30 /arch/s390/include/asm/topology.h
parentMerge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff)
downloadlinux-dev-22be9cd9f22a4b2acc5fe6666ca23206ebe4d495.tar.xz
linux-dev-22be9cd9f22a4b2acc5fe6666ca23206ebe4d495.zip
s390/numa: use correct type for node_to_cpumask_map
With CONFIG_CPUMASK_OFFSTACK=y cpumask_var_t is a pointer to a CPU mask. Replace the incorrect type for node_to_cpumask_map with cpumask_t. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/topology.h')
-rw-r--r--arch/s390/include/asm/topology.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index 27ebde643933..94fc55fc72ce 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -68,7 +68,7 @@ static inline int cpu_to_node(int cpu)
#define cpumask_of_node cpumask_of_node
static inline const struct cpumask *cpumask_of_node(int node)
{
- return node_to_cpumask_map[node];
+ return &node_to_cpumask_map[node];
}
/*