git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
topology.c
diff --git
a/arch/s390/kernel/topology.c
b/arch/s390/kernel/topology.c
index
94b06c3
..
2eafb8c
100644
(file)
--- a/
arch/s390/kernel/topology.c
+++ b/
arch/s390/kernel/topology.c
@@
-52,20
+52,20
@@
static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
{
cpumask_t mask;
{
cpumask_t mask;
- cpu
s_clear(
mask);
+ cpu
mask_clear(&
mask);
if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {
cpumask_copy(&mask, cpumask_of(cpu));
return mask;
}
while (info) {
if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {
cpumask_copy(&mask, cpumask_of(cpu));
return mask;
}
while (info) {
- if (cpu
_isset(cpu,
info->mask)) {
+ if (cpu
mask_test_cpu(cpu, &
info->mask)) {
mask = info->mask;
break;
}
info = info->next;
}
mask = info->mask;
break;
}
info = info->next;
}
- if (cpu
s_empty(
mask))
-
mask = cpumask_of_cpu(cpu
);
+ if (cpu
mask_empty(&
mask))
+
cpumask_copy(&mask, cpumask_of(cpu)
);
return mask;
}
return mask;
}
@@
-85,10
+85,10
@@
static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
if (cpu_logical_map(lcpu) != rcpu)
continue;
#ifdef CONFIG_SCHED_BOOK
if (cpu_logical_map(lcpu) != rcpu)
continue;
#ifdef CONFIG_SCHED_BOOK
- cpu
_set(lcpu,
book->mask);
+ cpu
mask_set_cpu(lcpu, &
book->mask);
cpu_book_id[lcpu] = book->id;
#endif
cpu_book_id[lcpu] = book->id;
#endif
- cpu
_set(lcpu,
core->mask);
+ cpu
mask_set_cpu(lcpu, &
core->mask);
cpu_core_id[lcpu] = core->id;
smp_cpu_polarization[lcpu] = tl_cpu->pp;
}
cpu_core_id[lcpu] = core->id;
smp_cpu_polarization[lcpu] = tl_cpu->pp;
}
@@
-101,13
+101,13
@@
static void clear_masks(void)
info = &core_info;
while (info) {
info = &core_info;
while (info) {
- cpu
s_clear(
info->mask);
+ cpu
mask_clear(&
info->mask);
info = info->next;
}
#ifdef CONFIG_SCHED_BOOK
info = &book_info;
while (info) {
info = info->next;
}
#ifdef CONFIG_SCHED_BOOK
info = &book_info;
while (info) {
- cpu
s_clear(
info->mask);
+ cpu
mask_clear(&
info->mask);
info = info->next;
}
#endif
info = info->next;
}
#endif