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 'locking-urgent-2021-05-09' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
ia64
/
kernel
/
acpi.c
diff --git
a/arch/ia64/kernel/acpi.c
b/arch/ia64/kernel/acpi.c
index
a563652
..
e2af6b1
100644
(file)
--- a/
arch/ia64/kernel/acpi.c
+++ b/
arch/ia64/kernel/acpi.c
@@
-446,7
+446,8
@@
void __init acpi_numa_fixup(void)
if (srat_num_cpus == 0) {
node_set_online(0);
node_cpuid[0].phys_id = hard_smp_processor_id();
if (srat_num_cpus == 0) {
node_set_online(0);
node_cpuid[0].phys_id = hard_smp_processor_id();
- return;
+ slit_distance(0, 0) = LOCAL_DISTANCE;
+ goto out;
}
/*
}
/*
@@
-489,7
+490,7
@@
void __init acpi_numa_fixup(void)
for (j = 0; j < MAX_NUMNODES; j++)
slit_distance(i, j) = i == j ?
LOCAL_DISTANCE : REMOTE_DISTANCE;
for (j = 0; j < MAX_NUMNODES; j++)
slit_distance(i, j) = i == j ?
LOCAL_DISTANCE : REMOTE_DISTANCE;
-
return
;
+
goto out
;
}
memset(numa_slit, -1, sizeof(numa_slit));
}
memset(numa_slit, -1, sizeof(numa_slit));
@@
-514,6
+515,8
@@
void __init acpi_numa_fixup(void)
printk("\n");
}
#endif
printk("\n");
}
#endif
+out:
+ node_possible_map = node_online_map;
}
#endif /* CONFIG_ACPI_NUMA */
}
#endif /* CONFIG_ACPI_NUMA */