projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git]
/
arch
/
s390
/
kernel
/
topology.c
diff --git
a/arch/s390/kernel/topology.c
b/arch/s390/kernel/topology.c
index
d2458a2
..
58f8291
100644
(file)
--- a/
arch/s390/kernel/topology.c
+++ b/
arch/s390/kernel/topology.c
@@
-67,7
+67,7
@@
static void cpu_group_map(cpumask_t *dst, struct mask_info *info, unsigned int c
static cpumask_t mask;
cpumask_clear(&mask);
static cpumask_t mask;
cpumask_clear(&mask);
- if (!cpu
_online(cpu
))
+ if (!cpu
mask_test_cpu(cpu, &cpu_setup_mask
))
goto out;
cpumask_set_cpu(cpu, &mask);
switch (topology_mode) {
goto out;
cpumask_set_cpu(cpu, &mask);
switch (topology_mode) {
@@
-88,7
+88,7
@@
static void cpu_group_map(cpumask_t *dst, struct mask_info *info, unsigned int c
case TOPOLOGY_MODE_SINGLE:
break;
}
case TOPOLOGY_MODE_SINGLE:
break;
}
- cpumask_and(&mask, &mask,
cpu_online
_mask);
+ cpumask_and(&mask, &mask,
&cpu_setup
_mask);
out:
cpumask_copy(dst, &mask);
}
out:
cpumask_copy(dst, &mask);
}
@@
-99,16
+99,16
@@
static void cpu_thread_map(cpumask_t *dst, unsigned int cpu)
int i;
cpumask_clear(&mask);
int i;
cpumask_clear(&mask);
- if (!cpu
_online(cpu
))
+ if (!cpu
mask_test_cpu(cpu, &cpu_setup_mask
))
goto out;
cpumask_set_cpu(cpu, &mask);
if (topology_mode != TOPOLOGY_MODE_HW)
goto out;
cpu -= cpu % (smp_cpu_mtid + 1);
goto out;
cpumask_set_cpu(cpu, &mask);
if (topology_mode != TOPOLOGY_MODE_HW)
goto out;
cpu -= cpu % (smp_cpu_mtid + 1);
- for (i = 0; i <= smp_cpu_mtid; i++)
- if (cpu
_present(cpu + i
))
+ for (i = 0; i <= smp_cpu_mtid; i++)
{
+ if (cpu
mask_test_cpu(cpu + i, &cpu_setup_mask
))
cpumask_set_cpu(cpu + i, &mask);
cpumask_set_cpu(cpu + i, &mask);
- cpumask_and(&mask, &mask, cpu_online_mask);
+ }
out:
cpumask_copy(dst, &mask);
}
out:
cpumask_copy(dst, &mask);
}
@@
-569,6
+569,7
@@
void __init topology_init_early(void)
alloc_masks(info, &book_info, 2);
alloc_masks(info, &drawer_info, 3);
out:
alloc_masks(info, &book_info, 2);
alloc_masks(info, &drawer_info, 3);
out:
+ cpumask_set_cpu(0, &cpu_setup_mask);
__arch_update_cpu_topology();
__arch_update_dedicated_flag(NULL);
}
__arch_update_cpu_topology();
__arch_update_dedicated_flag(NULL);
}