Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"

This reverts commit 0e83ec8c8e which is
commit 267b21d0bef8e67dbe6c591c9991444e58237ec9 upstream.

It breaks Pixel systems and can be brought back in the future if it's
really needed.

Change-Id: Ic96fe3259ce2fe4186301e64cfa400057c3dba0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-03-11 15:13:19 +00:00
committed by Treehugger Robot
parent 97c6e8c639
commit 897e9179dd

View File

@@ -105,12 +105,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
prop = of_get_flat_dt_prop(node, "alignment", &len);
if (prop) {
if (len != dt_root_size_cells * sizeof(__be32)) {
if (len != dt_root_addr_cells * sizeof(__be32)) {
pr_err("invalid alignment property in '%s' node.\n",
uname);
return -EINVAL;
}
align = dt_mem_next_cell(dt_root_size_cells, &prop);
align = dt_mem_next_cell(dt_root_addr_cells, &prop);
}
nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;