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/numa/numa.c | |
| parent | Merge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| download | linux-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/numa/numa.c')
| -rw-r--r-- | arch/s390/numa/numa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c index 09b1d2355bd9..43f32ce60aa3 100644 --- a/arch/s390/numa/numa.c +++ b/arch/s390/numa/numa.c @@ -23,7 +23,7 @@ pg_data_t *node_data[MAX_NUMNODES]; EXPORT_SYMBOL(node_data); -cpumask_var_t node_to_cpumask_map[MAX_NUMNODES]; +cpumask_t node_to_cpumask_map[MAX_NUMNODES]; EXPORT_SYMBOL(node_to_cpumask_map); const struct numa_mode numa_mode_plain = { @@ -144,7 +144,7 @@ void __init numa_setup(void) static int __init numa_init_early(void) { /* Attach all possible CPUs to node 0 for now. */ - cpumask_copy(node_to_cpumask_map[0], cpu_possible_mask); + cpumask_copy(&node_to_cpumask_map[0], cpu_possible_mask); return 0; } early_initcall(numa_init_early); |