diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-09-22 14:21:16 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-09-23 09:18:56 +0200 |
| commit | 22be9cd9f22a4b2acc5fe6666ca23206ebe4d495 (patch) | |
| tree | 20fd93a283a4fcd5686dd725b94ebec3346e4e30 /arch/s390/include/asm | |
| parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
| download | linux-22be9cd9f22a4b2acc5fe6666ca23206ebe4d495.tar.gz linux-22be9cd9f22a4b2acc5fe6666ca23206ebe4d495.tar.bz2 linux-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')
| -rw-r--r-- | arch/s390/include/asm/numa.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/topology.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/numa.h b/arch/s390/include/asm/numa.h index 2a0efc63b9e5..dc19ee0c92aa 100644 --- a/arch/s390/include/asm/numa.h +++ b/arch/s390/include/asm/numa.h @@ -19,7 +19,7 @@ int numa_pfn_to_nid(unsigned long pfn); int __node_distance(int a, int b); void numa_update_cpu_topology(void); -extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES]; +extern cpumask_t node_to_cpumask_map[MAX_NUMNODES]; extern int numa_debug_enabled; #else 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]; } /* |