summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuntao Wang <ytcoode@gmail.com>2023-12-06 13:43:18 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-12-12 22:36:19 +0300
commite3f577830ce216b0ca21d4750cbbd64cfc21efff (patch)
tree9e8c0b138195e362fd0dd286b32f4ee300a9b8f9
parentec0f96260737ae23dcad57463fdc32eba025b11d (diff)
downloadlinux-e3f577830ce216b0ca21d4750cbbd64cfc21efff.tar.xz
ACPI: NUMA: Fix the logic of getting the fake_pxm value
The for loop does not iterate over the last element of the node_to_pxm_map array. This could lead to a conflict between the final fake_pxm value and the existing pxm values. That is, the final fake_pxm value can not be guaranteed to be an unused pxm value. While at it, fix up white space in slit_valid(). Signed-off-by: Yuntao Wang <ytcoode@gmail.com> [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/numa/srat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
index d58e5ef424f2..0214518fc582 100644
--- a/drivers/acpi/numa/srat.c
+++ b/drivers/acpi/numa/srat.c
@@ -183,7 +183,7 @@ static int __init slit_valid(struct acpi_table_slit *slit)
int i, j;
int d = slit->locality_count;
for (i = 0; i < d; i++) {
- for (j = 0; j < d; j++) {
+ for (j = 0; j < d; j++) {
u8 val = slit->entry[d*i + j];
if (i == j) {
if (val != LOCAL_DISTANCE)
@@ -532,7 +532,7 @@ int __init acpi_numa_init(void)
*/
/* fake_pxm is the next unused PXM value after SRAT parsing */
- for (i = 0, fake_pxm = -1; i < MAX_NUMNODES - 1; i++) {
+ for (i = 0, fake_pxm = -1; i < MAX_NUMNODES; i++) {
if (node_to_pxm_map[i] > fake_pxm)
fake_pxm = node_to_pxm_map[i];
}