diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 14:59:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 14:59:36 +0100 |
| commit | 3ec20e2e618314a798c81a974455b0a47e2af435 (patch) | |
| tree | c36ee1a6ed3a8c28911f6ae95f7cf060c2087189 /arch/s390/numa/mode_emu.c | |
| parent | 3c68319b28474055481824032e6730c28404116f (diff) | |
| parent | daad0bf1491e5321c76a6ba4ccf50a4991494aa8 (diff) | |
| download | linux-3ec20e2e618314a798c81a974455b0a47e2af435.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Three bug fixes and an update to the default configuration"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/defconfig: set SCSI_DH=y
s390/vtime: correct scaled cputime of partially idle CPUs
s390/boot/decompression: disable floating point in decompressor
s390/numa: use correct type for node_to_cpumask_map
Diffstat (limited to 'arch/s390/numa/mode_emu.c')
| -rw-r--r-- | arch/s390/numa/mode_emu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c index 7de4e2f780d7..30b2698a28e2 100644 --- a/arch/s390/numa/mode_emu.c +++ b/arch/s390/numa/mode_emu.c @@ -368,7 +368,7 @@ static void topology_add_core(struct toptree *core) cpumask_copy(&top->thread_mask, &core->mask); cpumask_copy(&top->core_mask, &core_mc(core)->mask); cpumask_copy(&top->book_mask, &core_book(core)->mask); - cpumask_set_cpu(cpu, node_to_cpumask_map[core_node(core)->id]); + cpumask_set_cpu(cpu, &node_to_cpumask_map[core_node(core)->id]); top->node_id = core_node(core)->id; } } @@ -383,7 +383,7 @@ static void toptree_to_topology(struct toptree *numa) /* Clear all node masks */ for (i = 0; i < MAX_NUMNODES; i++) - cpumask_clear(node_to_cpumask_map[i]); + cpumask_clear(&node_to_cpumask_map[i]); /* Rebuild all masks */ toptree_for_each(core, numa, CORE) |