Skip to content

Commit cd8e702

Browse files
Alexander GordeevVasily Gorbik
authored andcommitted
s390/numa: remove redundant cpus_with_topology variable
Variable cpus_with_topology is a leftover that became unneeded once the fake NUMA support has been removed. Signed-off-by: Alexander Gordeev <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 42d211a commit cd8e702

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

arch/s390/include/asm/topology.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ struct cpu_topology_s390 {
2424
};
2525

2626
extern struct cpu_topology_s390 cpu_topology[NR_CPUS];
27-
extern cpumask_t cpus_with_topology;
2827

2928
#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)
3029
#define topology_thread_id(cpu) (cpu_topology[cpu].thread_id)

arch/s390/kernel/topology.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ static struct mask_info drawer_info;
6262
struct cpu_topology_s390 cpu_topology[NR_CPUS];
6363
EXPORT_SYMBOL_GPL(cpu_topology);
6464

65-
cpumask_t cpus_with_topology;
66-
6765
static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
6866
{
6967
cpumask_t mask;
@@ -137,7 +135,6 @@ static void add_cpus_to_mask(struct topology_core *tl_core,
137135
cpumask_set_cpu(lcpu + i, &drawer->mask);
138136
cpumask_set_cpu(lcpu + i, &book->mask);
139137
cpumask_set_cpu(lcpu + i, &socket->mask);
140-
cpumask_set_cpu(lcpu + i, &cpus_with_topology);
141138
smp_cpu_set_polarization(lcpu + i, tl_core->pp);
142139
}
143140
}
@@ -262,8 +259,6 @@ static void update_cpu_masks(void)
262259
topo->socket_id = id;
263260
topo->book_id = id;
264261
topo->drawer_id = id;
265-
if (cpu_present(cpu))
266-
cpumask_set_cpu(cpu, &cpus_with_topology);
267262
}
268263
}
269264
}
@@ -287,7 +282,6 @@ static int __arch_update_cpu_topology(void)
287282
int rc = 0;
288283

289284
mutex_lock(&smp_cpu_state_mutex);
290-
cpumask_clear(&cpus_with_topology);
291285
if (MACHINE_HAS_TOPOLOGY) {
292286
rc = 1;
293287
store_topology(info);

0 commit comments

Comments
 (0)