Commit patch from upstream hwloc: r3482. Fixes some compiler
warnings. This commit was SVN r24641. The following SVN revision numbers were found above: r3482 --> open-mpi/ompi@2435be8d49
Этот коммит содержится в:
родитель
d134ff9b4d
Коммит
7b48042ffd
@ -219,7 +219,7 @@ static void look_proc(struct procinfo *infos, unsigned highest_cpuid, unsigned h
|
||||
}
|
||||
|
||||
if (cpuid_type == intel && highest_cpuid >= 0x0b) {
|
||||
unsigned level, apic_nextshift, apic_number, apic_type, apic_id, apic_shift = 0, id;
|
||||
unsigned level, apic_nextshift, apic_number, apic_type, apic_id = 0, apic_shift = 0, id;
|
||||
for (level = 0; ; level++) {
|
||||
ecx = level;
|
||||
eax = 0x0b;
|
||||
@ -270,7 +270,8 @@ static void look_proc(struct procinfo *infos, unsigned highest_cpuid, unsigned h
|
||||
static void summarize(hwloc_topology_t topology, struct procinfo *infos, unsigned nbprocs)
|
||||
{
|
||||
hwloc_bitmap_t complete_cpuset = hwloc_bitmap_alloc();
|
||||
unsigned i, j, l, one, level;
|
||||
unsigned i, j, l, level;
|
||||
int one = -1;
|
||||
|
||||
for (i = 0; i < nbprocs; i++)
|
||||
if (infos[i].present) {
|
||||
@ -278,6 +279,9 @@ static void summarize(hwloc_topology_t topology, struct procinfo *infos, unsigne
|
||||
one = i;
|
||||
}
|
||||
|
||||
if (one == -1)
|
||||
return;
|
||||
|
||||
/* Look for sockets */
|
||||
{
|
||||
hwloc_bitmap_t sockets_cpuset = hwloc_bitmap_dup(complete_cpuset);
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user